You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ac...@apache.org on 2014/11/13 19:37:12 UTC
[2/2] hadoop git commit: YARN-2635. Merging to branch-2.6 for
hadoop-2.6.0-rc1.
YARN-2635. Merging to branch-2.6 for hadoop-2.6.0-rc1.
(cherry picked from commit 81dc0ac6dcf2f34ad607da815ea0144f178691a9)
Conflicts:
hadoop-yarn-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f8892660
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f8892660
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f8892660
Branch: refs/heads/branch-2.6
Commit: f8892660a8508e1627bdfdbada7f11326619e989
Parents: b579c3d
Author: Arun C. Murthy <ac...@apache.org>
Authored: Thu Nov 13 10:27:47 2014 -0800
Committer: Arun C. Murthy <ac...@apache.org>
Committed: Thu Nov 13 10:36:58 2014 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f8892660/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d5bd97f..b8bb9a9 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -367,6 +367,9 @@ Release 2.6.0 - 2014-11-15
YARN-2818. Removed the now unnecessary user entity injection from Timeline
service given we now have domains. (Zhijie Shen via vinodkv)
+ YARN-2635. TestRM, TestRMRestart, TestClientToAMTokens should run
+ with both CS and FS. (Wei Yan and kasha via kasha)
+
OPTIMIZATIONS
BUG FIXES