Thomas Graves 5a17a40ee6 merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367715 13f79535-47bb-0310-9956-ffa450edef68		2012-07-31 19:21:27 +00:00
..
main/java/org/apache/hadoop	merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493	2012-07-31 19:21:27 +00:00
test/java	Merge -r 1328108:1328109 from trunk to branch. FIXES: MAPREDUCE-3867	2012-04-19 20:34:49 +00:00