Repository: hadoop Updated Branches: refs/heads/trunk 6f5290b03 -> 3157d992b
Move HADOOP-11543 section in CHANGES.txt to remove the conflict between trunk and branch-2. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3157d992 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3157d992 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3157d992 Branch: refs/heads/trunk Commit: 3157d992b0abce43a87caa5114d3f7ac4e5a7ce1 Parents: 6f5290b Author: Akira Ajisaka <aajis...@apache.org> Authored: Thu Feb 12 14:33:55 2015 -0800 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Thu Feb 12 14:33:55 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3157d992/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 17c8918..0a274d3 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -583,9 +583,6 @@ Release 2.7.0 - UNRELEASED HADOOP-11463 Replace method-local TransferManager object with S3AFileSystem#transfers. (Ted Yu via stevel) - HADOOP-11543. Improve help message for hadoop/yarn command. - (Brahma Reddy Battula via ozawa) - HADOOP-11520. Clean incomplete multi-part uploads in S3A tests. (Thomas Demoor via stevel) @@ -594,6 +591,9 @@ Release 2.7.0 - UNRELEASED HADOOP-10140. Specification of HADOOP_CONF_DIR via the environment in hadoop_config.cmd. (Kiran Kumar M R via cnauroth) + HADOOP-11543. Improve help message for hadoop/yarn command. (Brahma + Reddy Battula via ozawa). + OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array.
