Alejandro Abdelnur 2a178a8d0b Merge -r 1369905:1369906 from trunk to branch. FIXES: MAPREDUCE-4498 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369908 13f79535-47bb-0310-9956-ffa450edef68		2012-08-06 18:15:35 +00:00
..
src/main/resources/assemblies	Merge -r 1369905:1369906 from trunk to branch. FIXES: MAPREDUCE-4498	2012-08-06 18:15:35 +00:00
pom.xml	svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh)	2012-05-28 14:58:13 +00:00