Tsz-wo Sze 2de013e0a8 svn merge -c 1356086 from trunk for HDFS-3157. Fix a bug in the case that the generation stamps of the stored block in a namenode and the reported block from a datanode do not match. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356095 13f79535-47bb-0310-9956-ffa450edef68		2012-07-02 07:39:02 +00:00
..
dev-support	HDFS-3050. svn merge -c 1309629 from trunk	2012-04-05 00:03:58 +00:00
hadoop-hdfs	svn merge -c 1356086 from trunk for HDFS-3157. Fix a bug in the case that the generation stamps of the stored block in a namenode and the reported block from a datanode do not match.	2012-07-02 07:39:02 +00:00
hadoop-hdfs-httpfs	Merge -r 1355592:1355593 from trunk to branch. FIXES: HDFS-3580	2012-06-29 22:59:09 +00:00
pom.xml	Merge -r 1348956:1348957 from trunk to branch. FIXES: HADOOP-8368	2012-06-11 18:44:57 +00:00