Alejandro Abdelnur 52fa40b8ba Merge -r 1363161:1363162 from trunk to branch. FIXES: MAPREDUCE-4407 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363163 13f79535-47bb-0310-9956-ffa450edef68		2012-07-18 22:43:52 +00:00
..
src/main/resources/assemblies	Merge -r 1363161:1363162 from trunk to branch. FIXES: MAPREDUCE-4407	2012-07-18 22:43:52 +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