hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1309164 - in /hadoop/common/branches/HDFS-3042: ./ hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
Date Tue, 03 Apr 2012 21:48:28 GMT
Author: todd
Date: Tue Apr  3 21:48:23 2012
New Revision: 1309164

URL: http://svn.apache.org/viewvc?rev=1309164&view=rev
Log:
Merge trunk into auto-failover branch

Modified:
    hadoop/common/branches/HDFS-3042/   (props changed)
    hadoop/common/branches/HDFS-3042/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml

Propchange: hadoop/common/branches/HDFS-3042/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1308236-1309161

Modified: hadoop/common/branches/HDFS-3042/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml?rev=1309164&r1=1309163&r2=1309164&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
(original)
+++ hadoop/common/branches/HDFS-3042/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
Tue Apr  3 21:48:23 2012
@@ -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>



Mime
View raw message