hadoop/hadoop-hdfs-project
Colin Patrick Mccabe 51d49ffffd HDFS-7443. Datanode upgrade to BLOCKID_BASED_LAYOUT fails if duplicate block files are present in the same volume (cmccabe)
(cherry picked from commit 8fa265a290)
(cherry picked from commit bcaf15e2fa)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
2014-12-19 13:25:33 -08:00
..
dev-support HDFS-3050. svn merge -c 1309629 from trunk 2012-04-05 00:03:58 +00:00
hadoop-hdfs HDFS-7443. Datanode upgrade to BLOCKID_BASED_LAYOUT fails if duplicate block files are present in the same volume (cmccabe) 2014-12-19 13:25:33 -08: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-7387. NFS may only do partial commit due to a race between COMMIT and write. Contributed by Brandon Li 2014-11-12 11:50:04 -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