Thomas White 98cb5344eb Merge -r 1430928:1430929 from trunk to branch-2. Fixes: MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs. %!s(int64=12) %!d(string=hai) anos
..
java 98cb5344eb Merge -r 1430928:1430929 from trunk to branch-2. Fixes: MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs. %!s(int64=12) %!d(string=hai) anos
resources 954b0ff8ab Merge -r 1188475:1188476 from trunk to branch. FIXES: MAPREDUCE-3248 %!s(int64=14) %!d(string=hai) anos