Repository: hadoop
Updated Branches:
refs/heads/branch-2 eb4c9765d -> 44011a175
Update CHANGES.txt to reflect commit of MR-6377 to branch-2.7 and branch-2.6.
(cherry picked from commit be9f3bba73162ea6acc6fbc4b42f603fcbb9b371)
Conflicts:
hadoop-mapreduce-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/44011a17
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/44011a17
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/44011a17
Branch: refs/heads/branch-2
Commit: 44011a17595b6d3e5fa704e120bf3023813e6ff9
Parents: eb4c976
Author: Jason Lowe <[email protected]>
Authored: Wed Nov 18 17:26:13 2015 +0000
Committer: Jason Lowe <[email protected]>
Committed: Wed Nov 18 17:26:13 2015 +0000
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/44011a17/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index 9ce11db..c98e207 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -254,9 +254,6 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-5232. Add a configuration to be able to log classpath and other
system properties on mapreduce JVMs startup. (Sangjin Lee via vinodkv)
- MAPREDUCE-6377. JHS sorting on state column not working in webUi.
- (zhihai xu via devaraj)
-
MAPREDUCE-6388. Remove deprecation warnings from JobHistoryServer classes
(Ray Chiang via ozawa).
@@ -364,6 +361,9 @@ Release 2.7.3 - UNRELEASED
BUG FIXES
+ MAPREDUCE-6377. JHS sorting on state column not working in webUi.
+ (zhihai xu via devaraj)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
@@ -655,6 +655,9 @@ Release 2.6.3 - UNRELEASED
MAPREDUCE-6528. Memory leak for HistoryFileManager.getJobSummary()
(Junping Du via jlowe)
+ MAPREDUCE-6377. JHS sorting on state column not working in webUi.
+ (zhihai xu via devaraj)
+
Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES
