Author: vinodkv
Date: Wed Jan 15 20:21:49 2014
New Revision: 1558558
URL: http://svn.apache.org/r1558558
Log:
YARN-321. Forwarding YARN-321 branch to latest trunk.
Modified:
hadoop/common/branches/YARN-321/ (props changed)
hadoop/common/branches/YARN-321/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
Propchange: hadoop/common/branches/YARN-321/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1558246-1558557
Modified:
hadoop/common/branches/YARN-321/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml?rev=1558558&r1=1558557&r2=1558558&view=diff
==============================================================================
---
hadoop/common/branches/YARN-321/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
(original)
+++
hadoop/common/branches/YARN-321/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
Wed Jan 15 20:21:49 2014
@@ -214,8 +214,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>
