Repository: hadoop Updated Branches: refs/heads/trunk 1c8d19111 -> d67214fd6
Updated CHANGES.txt to move MAPREDUCE-6126 to 2.6 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d67214fd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d67214fd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d67214fd Branch: refs/heads/trunk Commit: d67214fd69f44391b7b43f7b7d18d8eefc3dd2da Parents: 1c8d191 Author: Jian He <[email protected]> Authored: Wed Oct 22 10:50:07 2014 -0700 Committer: Jian He <[email protected]> Committed: Wed Oct 22 10:50:36 2014 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d67214fd/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 37f973a..84016b9 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -224,9 +224,6 @@ Trunk (Unreleased) MAPREDUCE-6078. native-task: fix gtest build on macosx (Binglin Chang) - MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. - (Junping Du via jianhe) - Release 2.7.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -441,6 +438,9 @@ Release 2.6.0 - UNRELEASED MAPREDUCE-5542. Killing a job just as it finishes can generate an NPE in client (Rohith via jlowe) + MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. + (Junping Du via jianhe) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES
