Author: vinodkv
Date: Mon Mar 3 23:09:50 2014
New Revision: 1573797
URL: http://svn.apache.org/r1573797
Log:
YARN-1748. Excluded core-site.xml from hadoop-yarn-server-tests package's jar
and thus avoid breaking downstream tests. Contributed by Sravya Tirukkovalur.
svn merge --ignore-ancestry -c 1573795 ../../trunk/
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt?rev=1573797&r1=1573796&r2=1573797&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt Mon Mar
3 23:09:50 2014
@@ -336,6 +336,9 @@ Release 2.4.0 - UNRELEASED
configuration files and thus fix failures in downstream tests. (Xuan Gong
via
vinodkv)
+ YARN-1748. Excluded core-site.xml from hadoop-yarn-server-tests package's
jar
+ and thus avoid breaking downstream tests. (Sravya Tirukkovalur via vinodkv)
+
Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml?rev=1573797&r1=1573796&r2=1573797&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml
Mon Mar 3 23:09:50 2014
@@ -138,6 +138,11 @@
<goals>
<goal>test-jar</goal>
</goals>
+ <configuration>
+ <excludes>
+ <exclude>**/core-site.xml</exclude>
+ </excludes>
+ </configuration>
<phase>test-compile</phase>
</execution>
</executions>
