hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From x...@apache.org
Subject hadoop git commit: HADOOP-12347. Fix mismatch parameter name in javadocs of AuthToken#setMaxInactives. Contributed by Xiaoyu Yao
Date Fri, 21 Aug 2015 23:42:48 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 27ced8253 -> a7e5a88b5


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


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

Branch: refs/heads/branch-2
Commit: a7e5a88b59b4abd16b7083eeac41d82b5cd9af75
Parents: 27ced82
Author: Xiaoyu Yao <xyao@apache.org>
Authored: Fri Aug 21 16:32:16 2015 -0700
Committer: Xiaoyu Yao <xyao@apache.org>
Committed: Fri Aug 21 16:41:34 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/a7e5a88b/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/a7e5a88b/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 c648687..837b84b 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/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


Mime
View raw message