Jason Darrell Lowe 890cd33bf7 svn merge -c 1594326 FIXES: MAPREDUCE-5814. fat jar with *-default.xml may fail when mapreduce.job.classloader=true. Contributed by Gera Shegalov ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594328 13f79535-47bb-0310-9956-ffa450edef68		2014-05-13 18:59:56 +00:00
..
java/org/apache/hadoop	svn merge -c 1594326 FIXES: MAPREDUCE-5814. fat jar with *-default.xml may fail when mapreduce.job.classloader=true. Contributed by Gera Shegalov	2014-05-13 18:59:56 +00:00
resources	Merge -r 1188475:1188476 from trunk to branch. FIXES: MAPREDUCE-3248	2011-10-28 23:30:05 +00:00