merge2
merge with other pul reqs
revert pom
Merge pull request #13 from jayunit100/master

Fixes for Permissions and Secuirty Exceptions  [MERGE]
Eclipse formatter settings (feel free to customize, change, reformat, or whatever, just run the code through this and we wont confuse github diff)
Gluster plugin run through the default Java code formatting pref.
Merge pull request #18 from gluster/reformat

Run the Java code through a standard formatter. Format settings in resource/
remove the unused release() method.
remove unused lock() method
remove unused getFileBlockLocations(Path p, long start, long len)
Merge pull request #22 from gluster/BZ927290

remove unused getFileBlockLocations(Path p, long start, long len)
Merge pull request #20 from gluster/BZ927284

remove unused lock() method
include jar for log4j default binding
No changes - just a manual merge (github couldn't auto merge on own).
Merge branch 'master' into BZ927288

Conflicts:
	src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFileSystem.java
Merge pull request #19 from gluster/BZ927288

remove the unused release() method.
Merge branch 'master' of ssh://github.com/gluster/hadoop-glusterfs
merge
Merge pull request #24 from jayunit100/master

BZ_921232