Tsz-Wo Nicholas Sze 022474c807 Merge branch 'HDFS-6584' into trunk ... Conflicts: hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicyConsiderLoad.java		2014-09-26 04:47:25 +08:00
..
apt	HADOOP-10821. Prepare the release notes for Hadoop 2.5.0. (Andrew Wang and Karthik Kambatla via kasha)	2014-07-29 00:47:57 +00:00
resources/css	Merge -r 1190702:1190703 from trunk to branch-0.23. Fixes: HADOOP-7763.	2011-10-29 00:17:58 +00:00
site.xml	Merge branch 'HDFS-6584' into trunk	2014-09-26 04:47:25 +08:00