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
..
.eclipse.templates	…
bin	merge -r 1394608:1394609 from trunk. FIXES: MAPREDUCE-4712	2012-10-08 19:04:43 +00:00
conf	Merge -c 1390218 from trunk to branch-2 to fix MAPREDUCE-4649. Ensure MapReduce JobHistory Daemon doens't assume HADOOP_YARN_HOME and HADOOP_MAPRED_HOME are the same. Contributed by Vinod K V.	2012-09-25 23:50:03 +00:00
dev-support	MAPREDUCE-4861. Cleanup: Remove unused mapreduce.security.token.DelegationTokenRenewal. (kkambatl via tucu)	2012-12-11 19:29:18 +00:00
hadoop-mapreduce-client	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
hadoop-mapreduce-examples	MAPREDUCE-4723. Fix warnings found by findbugs 2. Contributed by Sandy Ryza	2012-11-15 00:17:17 +00:00
lib/jdiff	JDiff output for release 0.22.0	2011-12-12 05:47:46 +00:00
.gitignore	…
CHANGES.txt	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
INSTALL	Merge -c 1390218 from trunk to branch-2 to fix MAPREDUCE-4649. Ensure MapReduce JobHistory Daemon doens't assume HADOOP_YARN_HOME and HADOOP_MAPRED_HOME are the same. Contributed by Vinod K V.	2012-09-25 23:50:03 +00:00
LICENSE.txt	…
NOTICE.txt	…
pom.xml	HADOOP-8738. Reverted since it broke MR based system tests.	2012-10-01 22:44:08 +00:00