Repository: hadoop Updated Branches: refs/heads/branch-2 9656ee4ee -> 5c1e809af
YARN-3835. hadoop-yarn-server-resourcemanager test package bundles core-site.xml, yarn-site.xml (vamsee via rkanter) (cherry picked from commit 99271b762129d78c86f3c9733a24c77962b0b3f7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5c1e809a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5c1e809a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5c1e809a Branch: refs/heads/branch-2 Commit: 5c1e809af5cee58a4ee4d7635685ef71d33d90ac Parents: 9656ee4 Author: Robert Kanter <[email protected]> Authored: Mon Jun 22 18:02:27 2015 -0700 Committer: Robert Kanter <[email protected]> Committed: Mon Jun 22 18:03:00 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop-yarn-server-resourcemanager/pom.xml | 4 ++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5c1e809a/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 6ee4c45..c863a41 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -497,6 +497,9 @@ Release 2.8.0 - UNRELEASED YARN-3802. Two RMNodes for the same NodeId are used in RM sometimes after NM is reconnected. (zhihai xu via xgong) + YARN-3835. hadoop-yarn-server-resourcemanager test package bundles + core-site.xml, yarn-site.xml (vamsee via rkanter) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/5c1e809a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index b0ce4a7..e44d577 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -258,6 +258,10 @@ <mainClass>org.apache.hadoop.test.YarnTestDriver</mainClass> </manifest> </archive> + <excludes> + <exclude>**/core-site.xml</exclude> + <exclude>**/yarn-site.xml</exclude> + </excludes> </configuration> </execution> </executions>
