Selaa lähdekoodia

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

Arun C. Murthy 10 vuotta sitten
vanhempi
commit
cd8559e099
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2 2
      hadoop-yarn-project/CHANGES.txt

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

@@ -57,8 +57,6 @@ Release 2.7.0 - UNRELEASED
     YARN-2713. "RM Home" link in NM should point to one of the RMs in an 
     HA setup. (kasha)
 
-    YARN-2841. RMProxy should retry EOFException. (Jian He via xgong)
-
     YARN-2843. Fixed NodeLabelsManager to trim inputs for hosts and labels so
     as to make them work correctly. (Wangda Tan via vinodkv)
 
@@ -922,6 +920,8 @@ Release 2.6.0 - 2014-11-15
     consistent with the (somewhat incorrect) behaviour in the non-recovery case.
     (Jian He via vinodkv)
 
+    YARN-2841. RMProxy should retry EOFException. (Jian He via xgong)
+
 Release 2.5.2 - 2014-11-10
 
   INCOMPATIBLE CHANGES