HADOOP-12347. Fix mismatch parameter name in javadocs of 
AuthToken#setMaxInactives. Contributed by Xiaoyu Yao


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

Branch: refs/heads/HDFS-7240
Commit: caa636bf10d96ca2d4e151225fb46134ce99f9cf
Parents: 22de7c1
Author: Xiaoyu Yao <[email protected]>
Authored: Fri Aug 21 16:32:16 2015 -0700
Committer: Xiaoyu Yao <[email protected]>
Committed: Fri Aug 21 16:32:57 2015 -0700

----------------------------------------------------------------------
 .../apache/hadoop/security/authentication/util/AuthToken.java  | 3 ++-
 hadoop-common-project/hadoop-common/CHANGES.txt                | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/caa636bf/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/AuthToken.java
----------------------------------------------------------------------
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 870b267..4fbe599 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;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/caa636bf/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 d6353a4..b4445fa 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

Reply via email to