From b1e17d2dab890f29df1baebca71057e3f387b5b6 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Sun, 26 Oct 2014 11:25:24 -0700 Subject: [PATCH] HADOOP-11170. Pulling into branch-2.6 also, fixing CHANGES.txt. (cherry picked from commit 9ada9284d82fd926e8085e571f953330fc87266f) --- hadoop-common-project/hadoop-common/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 7c8faa910eb..ef4cc0e2003 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -28,9 +28,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 @@ -667,6 +664,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