Repository: hadoop Updated Branches: refs/heads/branch-2 17dfa04be -> 6944e7ef4
Add MR-5982 and MR-6492 to 2.6.4 (cherry picked from commit e5df366707e326d869f72db03b08228b33ff6e46) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6944e7ef Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6944e7ef Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6944e7ef Branch: refs/heads/branch-2 Commit: 6944e7ef44855da37bd73a04035662b16903a069 Parents: 17dfa04 Author: Jason Lowe <[email protected]> Authored: Mon Jan 11 18:31:10 2016 +0000 Committer: Jason Lowe <[email protected]> Committed: Mon Jan 11 18:32:48 2016 +0000 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6944e7ef/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 329133c..caa0d77 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -710,6 +710,13 @@ Release 2.6.4 - UNRELEASED MAPREDUCE-6577. MR AM unable to load native library without MR_AM_ADMIN_USER_ENV set (sjlee) + MAPREDUCE-5982. Task attempts that fail from the ASSIGNED state can + disappear (Chang Li via jlowe) + + MAPREDUCE-6492. AsyncDispatcher exit with NPE on + TaskAttemptImpl#sendJHStartEventForAssignedFailTask (Bibin A Chundatt via + jlowe) + Release 2.6.3 - 2015-12-17 INCOMPATIBLE CHANGES
