Chris Nauroth f0d3664d83 MAPREDUCE-5852. Merging change r1589006 from trunk to branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589007 13f79535-47bb-0310-9956-ffa450edef68		2014-04-21 23:49:28 +00:00
..
main/java/org/apache/hadoop	HADOOP-10485. Merge r1586059 from trunk.	2014-04-09 18:12:17 +00:00
test	MAPREDUCE-5852. Merging change r1589006 from trunk to branch-2.	2014-04-21 23:49:28 +00:00