Browse Source

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

(cherry picked from commit caa636bf10d96ca2d4e151225fb46134ce99f9cf)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
Xiaoyu Yao 9 years ago
parent
commit
a7e5a88b59

+ 2 - 1
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;

+ 6 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -172,6 +172,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)
+
   BUG FIXES
 
     HADOOP-12124. Add HTrace support for FsShell (cmccabe)
@@ -570,6 +573,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