From 8380ca37237a21638e1bcad0dd0e4c7e9f1a1786 Mon Sep 17 00:00:00 2001
From: Chris Douglas <cdouglas@apache.org>
Date: Mon, 6 Oct 2014 10:38:13 -0700
Subject: [PATCH] Move YARN-1051 to 2.6

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

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 8e4c5fef1f..1c9b595b9f 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -6,9 +6,6 @@ Trunk - Unreleased
 
   NEW FEATURES
 
-    YARN-1051. Add a system for creating reservations of cluster capacity.
-    (see breakdown below)
-
   IMPROVEMENTS
 
     YARN-2438. yarn-env.sh cleanup (aw)
@@ -30,43 +27,6 @@ Trunk - Unreleased
 
     YARN-2525. yarn logs command gives error on trunk (Akira AJISAKA via aw)
 
-  BREAKDOWN OF YARN-1051 SUBTASKS AND RELATED JIRAS
-
-    YARN-1707. Introduce APIs to add/remove/resize queues in the
-    CapacityScheduler. (Carlo Curino and Subru Krishnan via curino)
-
-    YARN-2475. Logic for responding to capacity drops for the
-    ReservationSystem. (Carlo Curino and Subru Krishnan via curino)
-
-    YARN-1708. Public YARN APIs for creating/updating/deleting
-    reservations. (Subru Krishnan and Carlo Curino via subru)
-
-    YARN-1709. In-memory data structures used to track resources over
-    time to enable reservations. (Subru Krishnan and Carlo Curino via
-    subru)
-
-    YARN-1710. Logic to find allocations within a Plan that satisfy
-    user ReservationRequest(s). (Carlo Curino and Subru Krishnan via
-    curino)
-
-    YARN-1711. Policy to enforce instantaneous and over-time quotas
-    on user reservations. (Carlo Curino and Subru Krishnan via curino)
-
-    YARN-1712. Plan follower that synchronizes the current state of reservation
-    subsystem with the scheduler. (Subru Krishnan and Carlo Curino via subru)
-
-    YARN-2080. Integrating reservation system with ResourceManager and
-    client-RM protocol. (Subru Krishnan and Carlo Curino via subru)
-
-    MAPREDUCE-6103. Adding reservation APIs to MR resource manager
-    delegate. (Subru Krishnan and Carlo Curino via subru)
-
-    YARN-2576. Fixing compilation, javadocs and audit issues to pass
-    test patch in branch. (Subru Krishnan and Carlo Curino via subru)
-
-    YARN-2611. Fixing jenkins findbugs warning and TestRMWebServicesCapacitySched
-    for branch YARN-1051. (Subru Krishnan and Carlo Curino via subru)
-
 Release 2.7.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -179,6 +139,9 @@ Release 2.6.0 - UNRELEASED
     YARN-2468. Enhanced NodeManager to support log handling APIs (YARN-2569) for
     use by long running services. (Xuan Gong via vinodkv)
 
+    YARN-1051. Add a system for creating reservations of cluster capacity.
+    (see breakdown below)
+
   IMPROVEMENTS
 
     YARN-2197. Add a link to YARN CHANGES.txt in the left side of doc
@@ -579,6 +542,43 @@ Release 2.6.0 - UNRELEASED
     YARN-2628. Capacity scheduler with DominantResourceCalculator carries out
     reservation even though slots are free. (Varun Vasudev via jianhe)
 
+  BREAKDOWN OF YARN-1051 SUBTASKS AND RELATED JIRAS
+
+    YARN-1707. Introduce APIs to add/remove/resize queues in the
+    CapacityScheduler. (Carlo Curino and Subru Krishnan via curino)
+
+    YARN-2475. Logic for responding to capacity drops for the
+    ReservationSystem. (Carlo Curino and Subru Krishnan via curino)
+
+    YARN-1708. Public YARN APIs for creating/updating/deleting
+    reservations. (Subru Krishnan and Carlo Curino via subru)
+
+    YARN-1709. In-memory data structures used to track resources over
+    time to enable reservations. (Subru Krishnan and Carlo Curino via
+    subru)
+
+    YARN-1710. Logic to find allocations within a Plan that satisfy
+    user ReservationRequest(s). (Carlo Curino and Subru Krishnan via
+    curino)
+
+    YARN-1711. Policy to enforce instantaneous and over-time quotas
+    on user reservations. (Carlo Curino and Subru Krishnan via curino)
+
+    YARN-1712. Plan follower that synchronizes the current state of reservation
+    subsystem with the scheduler. (Subru Krishnan and Carlo Curino via subru)
+
+    YARN-2080. Integrating reservation system with ResourceManager and
+    client-RM protocol. (Subru Krishnan and Carlo Curino via subru)
+
+    MAPREDUCE-6103. Adding reservation APIs to MR resource manager
+    delegate. (Subru Krishnan and Carlo Curino via subru)
+
+    YARN-2576. Fixing compilation, javadocs and audit issues to pass
+    test patch in branch. (Subru Krishnan and Carlo Curino via subru)
+
+    YARN-2611. Fixing jenkins findbugs warning and TestRMWebServicesCapacitySched
+    for branch YARN-1051. (Subru Krishnan and Carlo Curino via subru)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES