Colin Patrick Mccabe bcaf15e2fa 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) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java		2014-12-19 13:19:52 -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:19:52 -08:00
hadoop-hdfs-httpfs	HDFS-5578. [JDK8] Fix Javadoc errors caused by incorrect or illegal tags in doc comments. Contributed by Andrew Purtell.	2014-12-10 14:54:52 -08:00
hadoop-hdfs-nfs	HDFS-7449. Add metrics to NFS gateway. Contributed by Brandon Li	2014-12-11 15:43:06 -08:00
pom.xml	Preparing to release hadoop-2.6.0: Set version in branch-2 to 2.7.0-SNAPSHOT.	2014-11-09 19:19:02 -08:00