You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by br...@apache.org on 2014/10/30 21:29:59 UTC

git commit: update CHANGES.txt to move HADOOP-11247 to 2.6

Repository: hadoop
Updated Branches:
  refs/heads/trunk c2866ac34 -> 5e3f42811


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/5e3f4281
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5e3f4281
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5e3f4281

Branch: refs/heads/trunk
Commit: 5e3f42811ffe4a8ca68b4c49700e19f1a069f824
Parents: c2866ac
Author: Brandon Li <br...@apache.org>
Authored: Thu Oct 30 13:29:43 2014 -0700
Committer: Brandon Li <br...@apache.org>
Committed: Thu Oct 30 13:29:43 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/5e3f4281/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 6020119..194adf0 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -378,8 +378,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
@@ -684,6 +682,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