Zhe Zhang 1080c37300 Merge remote-tracking branch 'apache/trunk' into HDFS-7285 ... Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Namesystem.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java Change-Id: I8511c4d64b0959e79129febc179845a3892fedcc		2015-09-22 13:27:09 -07:00
..
dev-support	HDFS-8961. Investigate lock issue in o.a.h.hdfs.shortcircuit.DfsClientShmManager.EndpointShmManager. Contributed by Mingliang Liu.	2015-08-27 09:13:20 -07:00
src	Merge remote-tracking branch 'apache/trunk' into HDFS-7285	2015-09-22 13:27:09 -07:00
.gitattributes
CHANGES-HDFS-EC-7285.txt	HDFS-9091. Erasure Coding: Provide DistributedFilesystem API to getAllErasureCodingPolicies. Contributed by Rakesh R.	2015-09-21 13:24:02 -07:00
CHANGES.txt	HADOOP-12428. Fix inconsistency between log-level guards and statements. Contributed by Jagadesh Kiran N and Jackie Chang.	2015-09-22 12:54:29 +09:00
pom.xml	HDFS-8155. Support OAuth2 in WebHDFS.	2015-08-29 18:37:05 -07:00