Thomas White 98cb5344eb Merge -r 1430928:1430929 from trunk to branch-2. Fixes: MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430936 13f79535-47bb-0310-9956-ffa450edef68		2013-01-09 16:22:55 +00:00
..
src	Merge -r 1430928:1430929 from trunk to branch-2. Fixes: MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs.	2013-01-09 16:22:55 +00:00
pom.xml	MAPREDUCE-4920. Use security token protobuf definition from hadoop common. Contributed by Suresh Srinivas.	2013-01-07 11:15:10 +00:00