From 8e3046a391ba56e9275a19926a9dfb990c325726 Mon Sep 17 00:00:00 2001
From: Robert Joseph Evans <bobby@apache.org>
Date: Tue, 3 Apr 2012 14:21:02 +0000
Subject: [PATCH] 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
---
 .../src/main/resources/assemblies/hadoop-mapreduce-dist.xml    | 3 +++
 hadoop-mapreduce-project/CHANGES.txt                           | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
index eed27a88570..fff40cb43d1 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
@@ -155,6 +155,9 @@
       <excludes>
         <exclude>org.apache.hadoop:hadoop-common</exclude>
         <exclude>org.apache.hadoop:hadoop-hdfs</exclude>
+	<!-- use slf4j from common to avoid multiple binding warnings -->
+	<exclude>org.slf4j:slf4j-api</exclude>
+	<exclude>org.slf4j:slf4j-log4j12</exclude>
       </excludes>
     </dependencySet>
   </dependencySets>
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 1d3fbbc0c2d..c217f652c68 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -119,6 +119,8 @@ Release 0.23.3 - UNRELEASED
     MAPREDUCE-4024. RM webservices can't query on finalStatus (Tom Graves
     via bobby)
 
+    MAPREDUCE-4060. Multiple SLF4J binding warning (Jason Lowe via bobby)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES