From 4e9b46da11f79b4ca59c18769925b477ec1bf354 Mon Sep 17 00:00:00 2001
From: "Arun C. Murthy" <acmurthy@apache.org>
Date: Thu, 13 Nov 2014 11:39:35 -0800
Subject: [PATCH] YARN-1964. Adding changelog back in.

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

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 69e21ee8e9b..8b08007af82 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -6,6 +6,8 @@ Release 2.6.0 - 2014-11-15
 
   NEW FEATURES
 
+    YARN-1964. Create Docker analog of the LinuxContainerExecutor in YARN. (Abin 
+    Shahab via raviprak)
 
     YARN-2131. Add a way to format the RMStateStore. (Robert Kanter via kasha)