From 57d79f908e8da138d6222d0c7c072d9cb2760586 Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@apache.org>
Date: Tue, 9 Feb 2016 16:54:45 +0000
Subject: [PATCH] Update CHANGES.txt to reflect recent commits to branch-2.7
 and branch-2.6. (cherry picked from commit
 fba6e9f5ef3d032986888117b3e53808e7dcf873)

---
 hadoop-mapreduce-project/CHANGES.txt | 6 ++++++
 hadoop-yarn-project/CHANGES.txt      | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index b9cd7571d46..03ce515ee56 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -456,6 +456,9 @@ Release 2.7.3 - UNRELEASED
     MAPREDUCE-6621. Memory Leak in JobClient#submitJobInternal() (Xuan Gong
     via jlowe)
 
+    MAPREDUCE-6413. TestLocalJobSubmission is failing with unknown host
+    (zhihai xu via jlowe)
+
 Release 2.7.2 - 2016-01-25
 
   INCOMPATIBLE CHANGES
@@ -740,6 +743,9 @@ Release 2.6.5 - UNRELEASED
 
   BUG FIXES
 
+    MAPREDUCE-6413. TestLocalJobSubmission is failing with unknown host
+    (zhihai xu via jlowe)
+
 Release 2.6.4 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 634136e8bc0..338553ceaf4 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1421,6 +1421,9 @@ Release 2.7.3 - UNRELEASED
     YARN-3102. Decommisioned Nodes not listed in Web UI (Kuhu Shukla via
     jlowe)
 
+    YARN-3602. TestResourceLocalizationService.testPublicResourceInitializesLocalDir
+    fails Intermittently due to IOException from cleanup. (zhihai xu via xgong)
+
 Release 2.7.2 - 2016-01-25
 
   INCOMPATIBLE CHANGES