hadoop/hadoop-common-project
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
..
dev-support merge HADOOP-7998 2012-01-27 22:50:45 +00:00
hadoop-annotations Preparing for 2.6.0 development. Updated versions. 2014-07-03 06:11:57 +00:00
hadoop-auth HADOOP-11017. KMS delegation token secret manager should be able to use zookeeper as store. (asuresh via tucu) 2014-09-20 08:24:34 -07:00
hadoop-auth-examples Preparing for 2.6.0 development. Updated versions. 2014-07-03 06:11:57 +00:00
hadoop-common Merge branch 'HDFS-6584' into trunk 2014-09-26 04:47:25 +08:00
hadoop-kms HDFS-6987. Move CipherSuite xattr information up to the encryption zone root. (Zhe Zhang via wang) 2014-09-24 12:11:45 -07:00
hadoop-minikdc HADOOP-11111 MiniKDC to use locale EN_US for case conversions 2014-09-23 10:54:58 +01:00
hadoop-nfs HADOOP-10990. Add missed NFSv3 request and response classes. Contributed by Brandon Li 2014-09-02 11:29:35 -07:00
pom.xml HADOOP-10433. Key Management Server based on KeyProvider API. (tucu) 2014-08-21 18:58:53 +00:00