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 vi...@apache.org on 2014/10/26 19:26:01 UTC

git commit: HADOOP-11170. Pulling into branch-2.6 also, fixing CHANGES.txt.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 018664550 -> 9ada9284d


HADOOP-11170. Pulling into branch-2.6 also, fixing CHANGES.txt.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9ada9284
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9ada9284
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9ada9284

Branch: refs/heads/trunk
Commit: 9ada9284d82fd926e8085e571f953330fc87266f
Parents: 0186645
Author: Vinod Kumar Vavilapalli <vi...@apache.org>
Authored: Sun Oct 26 11:25:24 2014 -0700
Committer: Vinod Kumar Vavilapalli <vi...@apache.org>
Committed: Sun Oct 26 11:25:24 2014 -0700

----------------------------------------------------------------------
 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/9ada9284/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 35cd55e..f84fa1c 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -373,9 +373,6 @@ Release 2.7.0 - UNRELEASED
     HDFS-7227. Fix findbugs warning about NP_DEREFERENCE_OF_READLINE_VALUE in
     SpanReceiverHost (cmccabe)
 
-    HADOOP-11170. ZKDelegationTokenSecretManager fails to renewToken created by 
-    a peer. (Arun Suresh and Gregory Chanan via kasha)
-
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -1011,6 +1008,9 @@ Release 2.6.0 - UNRELEASED
     HADOOP-11228. Winutils task: unsecure path should not call
     AddNodeManagerAndUserACEsToObject. (Remus Rusanu via jianhe)
 
+    HADOOP-11170. ZKDelegationTokenSecretManager fails to renewToken created by 
+    a peer. (Arun Suresh and Gregory Chanan via kasha)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES