From a184fceddcb3792ad9718219f9ce575e84001b0a Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Wed, 9 Oct 2013 17:11:37 +0000
Subject: [PATCH] Amending yarn CHANGES.txt moving YARN-1284 to 2.2.1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530716 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-yarn-project/CHANGES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d588eaa473..6f5debd84c 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -76,9 +76,6 @@ Release 2.3.0 - UNRELEASED
 
     YARN-1268. TestFairScheduler.testContinuousScheduling is flaky (Sandy Ryza)
 
-    YARN-1284. LCE: Race condition leaves dangling cgroups entries for killed
-    containers. (Alejandro Abdelnur via Sandy Ryza)
-
 Release 2.2.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -91,6 +88,9 @@ Release 2.2.1 - UNRELEASED
 
   BUG FIXES
 
+    YARN-1284. LCE: Race condition leaves dangling cgroups entries for killed
+    containers. (Alejandro Abdelnur via Sandy Ryza)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES