Robert Joseph Evans 8e3046a391 svn merge -c 1308925 from trunk. FIXES MAPREDUCE-4060. Multiple SLF4J binding warning (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308930 13f79535-47bb-0310-9956-ffa450edef68		2012-04-03 14:21:02 +00:00
..
hadoop-dist.xml	Merge -r 1227900:1227901 from trunk to branch. FIXES: HADOOP-7907	2012-01-06 00:17:54 +00:00
hadoop-httpfs-dist.xml	Merge -r 1227967:1227968 from trunk to branch. FIXES: HADOOP-7936	2012-01-06 06:00:08 +00:00
hadoop-mapreduce-dist.xml	svn merge -c 1308925 from trunk. FIXES MAPREDUCE-4060. Multiple SLF4J binding warning (Jason Lowe via bobby)	2012-04-03 14:21:02 +00:00
hadoop-src.xml	Merge -r 1183150:1183151 from trunk to branch. FIXES: HADOOP-7743	2011-10-28 22:25:33 +00:00