From eb9296d3167611ab47db62fc5b8c16fd0850d562 Mon Sep 17 00:00:00 2001
From: Xuan <xgong@apache.org>
Date: Thu, 19 Nov 2015 10:14:18 -0800
Subject: [PATCH] YARN-2859 addendum: move the entry from 2.6.2 to 2.6.3 in
 hadoop-yarn/CHANGES.txt.

(cherry picked from commit 866dce4e8e105d0e2c7e041b5d30213536a61702)
(cherry picked from commit 8347b1048d063adaf40fc4f537aaa9bfd1157c37)
---
 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 32be9b9c205..4c552af258e 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -896,6 +896,9 @@ Release 2.6.3 - UNRELEASED
     YARN-4241. Fix typo of property name in yarn-default.xml.
     (Anthony Rojas via aajisaka)
 
+    YARN-2859. ApplicationHistoryServer binds to default port 8188 in MiniYARNCluster.
+    (Vinod Kumar Vavilapalli via xgong)
+
 Release 2.6.2 - 2015-10-28
 
   INCOMPATIBLE CHANGES
@@ -944,9 +947,6 @@ Release 2.6.2 - 2015-10-28
     YARN-3798. ZKRMStateStore shouldn't create new session without occurrance of 
     SESSIONEXPIED. (ozawa and Varun Saxena)
 
-    YARN-2859. ApplicationHistoryServer binds to default port 8188 in MiniYARNCluster.
-    (Vinod Kumar Vavilapalli via xgong)
-
 Release 2.6.1 - 2015-09-23
 
   INCOMPATIBLE CHANGES