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

Author: childsb

src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFileSystem.java

@@ -535,10 +535,6 @@ public long getDefaultBlockSize(){
         return 1<<26; /* default's from hdfs, kfs */
     }
 
-    @Deprecated
-    public void lock(Path path,boolean shared) throws IOException{
-    }
-
     public BlockLocation[] getFileBlockLocations(FileStatus file,long start,long len) throws IOException{
 
         Path absolute=makeAbsolute(file.getPath());
@@ -557,11 +553,6 @@ public BlockLocation[] getFileBlockLocations(FileStatus file,long start,long len
         return result;
     }
 
-    // getFileBlockLocations (FileStatus, long, long) is called by hadoop
-    public BlockLocation[] getFileBlockLocations(Path p,long start,long len) throws IOException{
-        return null;
-    }
-
     public void copyFromLocalFile(boolean delSrc,Path src,Path dst) throws IOException{
         FileUtil.copy(glusterFs, src, this, dst, delSrc, getConf());
     }