Author: jing9
Date: Wed Jan 15 23:31:58 2014
New Revision: 1558605
URL: http://svn.apache.org/r1558605
Log:
Merging r1557908 through r1558603 from trunk.
Modified:
hadoop/common/branches/HDFS-5698/ (props changed)
hadoop/common/branches/HDFS-5698/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
Propchange: hadoop/common/branches/HDFS-5698/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1557908-1558603
Modified:
hadoop/common/branches/HDFS-5698/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml?rev=1558605&r1=1558604&r2=1558605&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5698/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
(original)
+++
hadoop/common/branches/HDFS-5698/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
Wed Jan 15 23:31:58 2014
@@ -207,8 +207,7 @@
<outputDirectory>/share/hadoop/${hadoop.component}/lib</outputDirectory>
<!-- Exclude hadoop artifacts. They will be found via HADOOP* env -->
<excludes>
- <exclude>org.apache.hadoop:hadoop-common</exclude>
- <exclude>org.apache.hadoop:hadoop-hdfs</exclude>
+ <exclude>org.apache.hadoop:*</exclude>
<!-- use slf4j from common to avoid multiple binding warnings -->
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
