Repository: hadoop Updated Branches: refs/heads/branch-2 ec19c85e6 -> cc900b213
update CHANGES.txt to move HADOOP-11247 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/cc900b21 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cc900b21 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cc900b21 Branch: refs/heads/branch-2 Commit: cc900b213c4dec163ead9acf51deeaafef3b5383 Parents: ec19c85 Author: Brandon Li <[email protected]> Authored: Thu Oct 30 13:31:40 2014 -0700 Committer: Brandon Li <[email protected]> Committed: Thu Oct 30 13:31:40 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cc900b21/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 66feb1d..fb78ffd 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -33,8 +33,6 @@ Release 2.7.0 - UNRELEASED HADOOP-11186. documentation should talk about hadoop.htrace.spanreceiver.classes, not hadoop.trace.spanreceiver.classes (cmccabe) - HADOOP-11247. Fix a couple javac warnings in NFS. (Brandon Li via wheat9) - Release 2.6.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -339,6 +337,7 @@ Release 2.6.0 - UNRELEASED HADOOP-11195. Move Id-Name mapping in NFS to the hadoop-common area for better maintenance (Yongjun Zhang via brandonli) + HADOOP-11247. Fix a couple javac warnings in NFS. (Brandon Li via wheat9) BUG FIXES
