Repository: hadoop
Updated Branches:
  refs/heads/branch-2 f00815ac8 -> d2d8bc243


Update CHANGES.txt - Pulled in YARN-3465, YARN-3516, and YARN-3464 to 
branch-2.7 (for 2.7.1)

(cherry picked from commit 32cd2c8d429ddb87348299c00b7d851246a25b4e)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d2d8bc24
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d2d8bc24
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d2d8bc24

Branch: refs/heads/branch-2
Commit: d2d8bc243b9f6ccc5da0f964e56d0218fe1cfa40
Parents: f00815a
Author: Karthik Kambatla <ka...@apache.org>
Authored: Mon Apr 27 13:42:45 2015 -0700
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Mon Apr 27 13:44:06 2015 -0700

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d2d8bc24/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index e18bf8d..20de1ed 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -185,9 +185,6 @@ Release 2.8.0 - UNRELEASED
     YARN-2890. MiniYarnCluster should turn on timeline service if
     configured to do so. (Mit Desai via hitesh)
 
-    YARN-3465. Use LinkedHashMap to preserve order of resource requests. 
-    (Zhihai Xu via kasha)
-
     YARN-3266. RMContext#inactiveNodes should have NodeId as map key.
     (Chengbing Liu via jianhe)
 
@@ -209,9 +206,6 @@ Release 2.8.0 - UNRELEASED
     YARN-3434. Interaction between reservations and userlimit can result in 
     significant ULF violation (tgraves)
 
-    YARN-3516. killing ContainerLocalizer action doesn't take effect when
-    private localizer receives FETCH_FAILURE status.(zhihai xu via xgong)
-
     YARN-3387. Previous AM's container completed status couldn't pass to 
current
     AM if AM and RM restarted during the same time. (sandflee via jianhe)
 
@@ -220,9 +214,6 @@ Release 2.8.0 - UNRELEASED
     YARN-3537. NPE when NodeManager.serviceInit fails and stopRecoveryStore
     invoked (Brahma Reddy Battula via jlowe)
 
-    YARN-3464. Race condition in LocalizerRunner kills localizer before 
-    localizing all resources. (Zhihai Xu via kasha)
-
     YARN-3530. ATS throws exception on trying to filter results without 
otherinfo.
     (zhijie shen via xgong)
 
@@ -261,6 +252,15 @@ Release 2.7.1 - UNRELEASED
     YARN-3472. Fixed possible leak in DelegationTokenRenewer#allTokens.
     (Rohith Sharmaks via jianhe)
 
+    YARN-3465. Use LinkedHashMap to preserve order of resource requests. 
+    (Zhihai Xu via kasha)
+
+    YARN-3516. killing ContainerLocalizer action doesn't take effect when
+    private localizer receives FETCH_FAILURE status.(zhihai xu via xgong)
+
+    YARN-3464. Race condition in LocalizerRunner kills localizer before 
+    localizing all resources. (Zhihai Xu via kasha)
+
 Release 2.7.0 - 2015-04-20
 
   INCOMPATIBLE CHANGES

Reply via email to