瀏覽代碼

YARN-2635. Merging to branch-2.6 for hadoop-2.6.0-rc1.

Arun C. Murthy 10 年之前
父節點
當前提交
81dc0ac6dc
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      hadoop-yarn-project/CHANGES.txt

+ 3 - 3
hadoop-yarn-project/CHANGES.txt

@@ -53,9 +53,6 @@ Release 2.7.0 - UNRELEASED
     YARN-1979. TestDirectoryCollection fails when the umask is unusual.
     (Vinod Kumar Vavilapalli and Tsuyoshi OZAWA via junping_du)
 
-    YARN-2635. TestRM, TestRMRestart, TestClientToAMTokens should run 
-    with both CS and FS. (Wei Yan and kasha via kasha)
-
     YARN-2641. Decommission nodes on -refreshNodes instead of next 
     NM-RM heartbeat. (Zhihai Xu via kasha)
 
@@ -459,6 +456,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