From 1e24c3cdada70ab97c3adc3e1be30f9ac9514140 Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Fri, 11 Oct 2013 01:25:58 +0000 Subject: [PATCH] HADOOP-10039. Merge change r1531158 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531159 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../token/delegation/AbstractDelegationTokenSecretManager.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 743b76056f4..f23608b00ed 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -128,6 +128,9 @@ Release 2.2.1 - UNRELEASED HADOOP-10031. FsShell -get/copyToLocal/moveFromLocal should support Windows local path. (Chuan Liu via cnauroth) + HADOOP-10039. Add Hive to the list of projects using + AbstractDelegationTokenSecretManager. (Haohui Mai via jing9) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java index 708700b9623..e8a632a5e3d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java @@ -45,7 +45,7 @@ import com.google.common.base.Preconditions; -@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"}) +@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce", "Hive"}) @InterfaceStability.Evolving public abstract class AbstractDelegationTokenSecretManager