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-9002. Move o.a.h.hdfs.net/*Peer classes to hdfs-client. Contributed by Mingliang Liu.

2015-09-03 15:32:53 -07:00

src/main

Merge remote-tracking branch 'apache/trunk' into HDFS-7285

2015-09-22 13:27:09 -07:00

pom.xml

Merge remote-tracking branch 'apache/trunk' into HDFS-7285

2015-09-01 14:48:37 -07:00