From caa636bf10d96ca2d4e151225fb46134ce99f9cf Mon Sep 17 00:00:00 2001 From: Xiaoyu Yao Date: Fri, 21 Aug 2015 16:32:16 -0700 Subject: [PATCH] HADOOP-12347. Fix mismatch parameter name in javadocs of AuthToken#setMaxInactives. Contributed by Xiaoyu Yao --- .../hadoop/security/authentication/util/AuthToken.java | 3 ++- hadoop-common-project/hadoop-common/CHANGES.txt | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/AuthToken.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/AuthToken.java index 870b2670308..4fbe5997bcd 100644 --- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/AuthToken.java +++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/AuthToken.java @@ -96,7 +96,8 @@ public class AuthToken implements Principal { /** * Sets the max inactive interval of the token. * - * @param max inactive interval of the token in milliseconds since the epoch. + * @param interval max inactive interval of the token in milliseconds since + * the epoch. */ public void setMaxInactives(long interval) { this.maxInactives = interval; diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index d6353a4570b..b4445fa3b4f 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -750,6 +750,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12295. Improve NetworkTopology#InnerNode#remove logic. (yliu) + HADOOP-12050. Enable MaxInactiveInterval for hadoop http auth token + (hzlu via benoyantony) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp @@ -1067,6 +1070,9 @@ Release 2.8.0 - UNRELEASED because NM container recovery declares AM container as LOST (adhoot via rkanter) + HADOOP-12347. Fix mismatch parameter name in javadocs of + AuthToken#setMaxInactives (xyao) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES