Repository: hadoop Updated Branches: refs/heads/branch-2 10745fcec -> c5c544c1b
Moving CHANGES.txt entry for MAPREDUCE-4742 to branch-2.7. (cherry picked from commit bd0a9ba8e3b1c75dd2fc4cc65cb00c3e31d609ce) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c5c544c1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c5c544c1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c5c544c1 Branch: refs/heads/branch-2 Commit: c5c544c1b78a5fc597681662b1d6ad3cfbc4d403 Parents: 10745fc Author: Tsuyoshi Ozawa <[email protected]> Authored: Sat Mar 14 16:53:50 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Sat Mar 14 16:54:50 2015 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5c544c1/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index d8d89d1..2a79395 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -12,8 +12,6 @@ Release 2.8.0 - UNRELEASED BUG FIXES - MAPREDUCE-4742. Fix typo in nnbench#displayUsage. (Liang Xie via ozawa) - Release 2.7.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -192,6 +190,8 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-5657. [JDK8] Fix Javadoc errors caused by incorrect or illegal tags in doc comments. (Akira AJISAKA and Andrew Purtell via ozawa) + MAPREDUCE-4742. Fix typo in nnbench#displayUsage. (Liang Xie via ozawa) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES
