Repository: hadoop
Updated Branches:
  refs/heads/branch-2 9bf09b334 -> db1a33e95


Moving YARN-3351, YARN-3382, YARN-3472, MAPREDUCE-6238 to the 2.7.1 CHANGES.txt
sections given the recent merge into branch-2.7.

(cherry picked from commit 2f82ae042a6f3110742aaa57c076bb9ebd7888d1)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/db1a33e9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/db1a33e9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/db1a33e9

Branch: refs/heads/branch-2
Commit: db1a33e956675fad2737517e2d9dea6c1cbae2c4
Parents: 9bf09b3
Author: Vinod Kumar Vavilapalli <vino...@apache.org>
Authored: Fri Apr 24 17:18:46 2015 -0700
Committer: Vinod Kumar Vavilapalli <vino...@apache.org>
Committed: Fri Apr 24 17:20:02 2015 -0700

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt |  6 +++---
 hadoop-yarn-project/CHANGES.txt      | 17 +++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/db1a33e9/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index b5d1ba6..0a0bd32 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -89,9 +89,6 @@ Release 2.8.0 - UNRELEASED
     MAPREDUCE-6266. Job#getTrackingURL should consistently return a proper URL
     (rchiang via rkanter)
 
-    MAPREDUCE-6238. MR2 can't run local jobs with -libjars command options
-    which is a regression from MR1 (zxu via rkanter)
-
     MAPREDUCE-6293. Set job classloader on uber-job's LocalContainerLauncher
     event thread. (Sangjin Lee via gera)
 
@@ -115,6 +112,9 @@ Release 2.7.1 - UNRELEASED
 
     MAPREDUCE-6300. Task list sort by task id broken. (Siqi Li via aajisaka)
 
+    MAPREDUCE-6238. MR2 can't run local jobs with -libjars command options
+    which is a regression from MR1 (zxu via rkanter)
+
 Release 2.7.0 - 2015-04-20
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/db1a33e9/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 7964807..d8a8058 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -145,8 +145,6 @@ Release 2.8.0 - UNRELEASED
     YARN-3205 FileSystemRMStateStore should disable FileSystem Cache to avoid
     get a Filesystem with an old configuration. (Zhihai Xu via ozawa)
 
-    YARN-3351. AppMaster tracking URL is broken in HA. (Anubhav Dhoot via 
kasha)
-
     YARN-3269. Yarn.nodemanager.remote-app-log-dir could not be configured to 
     fully qualified path. (Xuan Gong via junping_du)
 
@@ -190,12 +188,6 @@ Release 2.8.0 - UNRELEASED
     YARN-3465. Use LinkedHashMap to preserve order of resource requests. 
     (Zhihai Xu via kasha)
 
-    YARN-3382. Some of UserMetricsInfo metrics are incorrectly set to root
-    queue metrics. (Rohit Agarwal via jianhe)
-
-    YARN-3472. Fixed possible leak in DelegationTokenRenewer#allTokens.
-    (Rohith Sharmaks via jianhe)
-
     YARN-3266. RMContext#inactiveNodes should have NodeId as map key.
     (Chengbing Liu via jianhe)
 
@@ -239,6 +231,7 @@ Release 2.7.1 - UNRELEASED
   OPTIMIZATIONS
 
   BUG FIXES
+
     YARN-3487. CapacityScheduler scheduler lock obtained unnecessarily when 
     calling getQueue (Jason Lowe via wangda)
 
@@ -254,6 +247,14 @@ Release 2.7.1 - UNRELEASED
     YARN-3522. Fixed DistributedShell to instantiate TimeLineClient as the
     correct user. (Zhijie Shen via jianhe)
 
+    YARN-3351. AppMaster tracking URL is broken in HA. (Anubhav Dhoot via 
kasha)
+
+    YARN-3382. Some of UserMetricsInfo metrics are incorrectly set to root
+    queue metrics. (Rohit Agarwal via jianhe)
+
+    YARN-3472. Fixed possible leak in DelegationTokenRenewer#allTokens.
+    (Rohith Sharmaks via jianhe)
+
 Release 2.7.0 - 2015-04-20
 
   INCOMPATIBLE CHANGES

Reply via email to