Repository: hadoop
Updated Branches:
  refs/heads/branch-2 24b60a7d1 -> f0aa2a746


MAPREDUCE-6294. Remove an extra parameter described in Javadoc of TockenCache. 
Contributed by Brahma Reddy Battula.

(cherry picked from commit 05499b1093ea6ba6a39a1354d67b0a46a2982824)


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

Branch: refs/heads/branch-2
Commit: f0aa2a746635d1d4a0aba89daada925bda3b6154
Parents: 24b60a7
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Sat Mar 28 00:08:35 2015 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Sat Mar 28 00:08:56 2015 +0900

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                              | 3 +++
 .../java/org/apache/hadoop/mapreduce/security/TokenCache.java     | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/f0aa2a74/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 25befc6..37eaf7b 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -57,6 +57,9 @@ Release 2.8.0 - UNRELEASED
     MAPREDUCE-6242. Progress report log is incredibly excessive in 
     application master. (Varun Saxena via devaraj)
 
+    MAPREDUCE-6294. Remove an extra parameter described in Javadoc of
+    TockenCache. (Brahma Reddy Battula via ozawa)
+
 Release 2.7.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/f0aa2a74/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
----------------------------------------------------------------------
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
index 7b1f657..6c0de1b 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
@@ -105,7 +105,6 @@ public class TokenCache {
    * get delegation token for a specific FS
    * @param fs
    * @param credentials
-   * @param p
    * @param conf
    * @throws IOException
    */

Reply via email to