big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8fd5520246
hadoop/hadoop-common-project
History
Zhe Zhang 8fd5520246 Merge remote-tracking branch 'apache/trunk' into HDFS-7285 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto
	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/DFSUtil.java
	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/datanode/DataNode.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirStatAndListingOp.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockTokenWithDFS.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java

Change-Id: Ic7946c4ea35bed587fe879ce58b959b25ecc0823
2015-09-29 01:39:16 -07:00
..
hadoop-annotations HADOOP-11814. Reformat hadoop-annotations, o.a.h.classification.tools. Contributed by Li Lu. 2015-04-08 17:56:23 -07:00
hadoop-auth HADOOP-12087. [JDK8] Fix javadoc errors caused by incorrect or illegal tags. (Akira AJISAKA via stevel). 2015-09-13 14:25:26 +01:00
hadoop-auth-examples HADOOP-11379. Fix new findbugs warnings in hadoop-auth*. Contributed by Li Lu. 2014-12-09 13:08:51 -08:00
hadoop-common Merge remote-tracking branch 'apache/trunk' into HDFS-7285 2015-09-29 01:39:16 -07:00
hadoop-kms HADOOP-12249. pull argument parsing into a function (aw) 2015-07-31 14:32:21 -07:00
hadoop-minikdc HADOOP-11686. MiniKDC cannot change ORG_NAME or ORG_DOMAIN. Contributed by Duo Zhang. 2015-03-09 11:07:40 -07:00
hadoop-nfs HADOOP-10387. Misspelling of threshold in log4j.properties for tests in hadoop-common-project. Contributed by Brahma Reddy Battula. 2015-05-07 16:53:57 +09:00
pom.xml HADOOP-10433. Key Management Server based on KeyProvider API. (tucu) 2014-05-05 21:43:14 +00:00