Jing Zhao 46b9393cab HDFS-7609. Avoid retry cache collision when Standby NameNode loading edits. Contributed by Ming Ma. ...

(cherry picked from commit 7817674a3a4d097b647dd77f1345787dd376d5ea)
(cherry picked from commit 17fb442a4c4e43105374c97fccd68dd966729a19)

Conflicts:
	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/NameNodeRpcServer.java

(cherry picked from commit fad2a062ddbb955a42dd5a90d64781617287f8df)

2015-09-03 13:40:45 -07:00

..

dev-support

HDFS-3050. svn merge -c 1309629 from trunk

2012-04-05 00:03:58 +00:00

hadoop-hdfs

HDFS-7609. Avoid retry cache collision when Standby NameNode loading edits. Contributed by Ming Ma.

2015-09-03 13:40:45 -07:00

hadoop-hdfs-httpfs

HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter.

2014-11-12 19:00:50 -08:00

hadoop-hdfs-nfs

HDFS-7733. NFS: readdir/readdirplus return null directory attribute on failure. (Contributed by Arpit Agarwal)

2015-02-04 16:26:00 -08:00

pom.xml

Preparing to release hadoop-2.6.0: Set version in branch-2.6 to 2.6.1-SNAPSHOT.

2014-11-09 19:21:11 -08:00