Brandon Li 531605ef28 HDFS-5649. Merging change 1556405 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556409 13f79535-47bb-0310-9956-ffa450edef68		2014-01-07 23:56:02 +00:00
..
main/java/org/apache/hadoop	HDFS-5649. Merging change 1556405 from trunk	2014-01-07 23:56:02 +00:00
test/java/org/apache/hadoop	HDFS-5587. Merging change r1548028 from trunk	2013-12-05 07:24:06 +00:00