Repository: hadoop Updated Branches: refs/heads/branch-2 36d3f1fcc -> b1e17d2da
HADOOP-11170. Pulling into branch-2.6 also, fixing CHANGES.txt. (cherry picked from commit 9ada9284d82fd926e8085e571f953330fc87266f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b1e17d2d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b1e17d2d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b1e17d2d Branch: refs/heads/branch-2 Commit: b1e17d2dab890f29df1baebca71057e3f387b5b6 Parents: 36d3f1f Author: Vinod Kumar Vavilapalli <[email protected]> Authored: Sun Oct 26 11:25:24 2014 -0700 Committer: Vinod Kumar Vavilapalli <[email protected]> Committed: Sun Oct 26 11:26:18 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/b1e17d2d/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 7c8faa9..ef4cc0e 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
