Jing Zhao a52f448e21 HDFS-4978. Merge r1502400 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502402 13f79535-47bb-0310-9956-ffa450edef68		2013-07-12 00:21:10 +00:00
..
dev-support	HDFS-3050. svn merge -c 1309629 from trunk	2012-04-05 00:03:58 +00:00
hadoop-hdfs	HDFS-4978. Merge r1502400 from trunk.	2013-07-12 00:21:10 +00:00
hadoop-hdfs-httpfs	HDFS-4980. Merge 1502302 from trunk	2013-07-11 18:11:27 +00:00
hadoop-hdfs-nfs	HDFS-4954. In nfs, OpenFileCtx.getFlushedOffset() should handle IOException. Contributed by Brandon Li	2013-07-03 11:16:15 +00:00
pom.xml	HDFS-4762,HDFS-4948. Merging change r1499029,r1499041,r1499152 from trunk to branch-2	2013-07-03 03:55:42 +00:00