From common-commits-return-89981-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Tue Oct 30 02:00:26 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 989A3180627 for ; Tue, 30 Oct 2018 02:00:25 +0100 (CET) Received: (qmail 66562 invoked by uid 500); 30 Oct 2018 01:00:24 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 66553 invoked by uid 99); 30 Oct 2018 01:00:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Oct 2018 01:00:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4307FDFD6B; Tue, 30 Oct 2018 01:00:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: <7776a399cd8d4e5b98d003ceb671018d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-15866. Renamed HADOOP_SECURITY_GROUP_SHELL_COMMAND_TIMEOUT keys break compatibility. Contributed by Wei-Chiu Chuang. Date: Tue, 30 Oct 2018 01:00:24 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 a0aa61014 -> f23f339a6 HADOOP-15866. Renamed HADOOP_SECURITY_GROUP_SHELL_COMMAND_TIMEOUT keys break compatibility. Contributed by Wei-Chiu Chuang. (cherry picked from commit 52cb766ad0bbea378a529fcff3cf372cf0a33cde) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f23f339a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f23f339a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f23f339a Branch: refs/heads/branch-2 Commit: f23f339a6c02eb20af1d920c4c5c72ed25244459 Parents: a0aa610 Author: Steve Loughran Authored: Mon Oct 22 11:06:56 2018 +0100 Committer: Akira Ajisaka Committed: Tue Oct 30 09:58:59 2018 +0900 ---------------------------------------------------------------------- .../hadoop/fs/CommonConfigurationKeysPublic.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f23f339a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java index df4dfbe..9adb9ba 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java @@ -557,13 +557,28 @@ public class CommonConfigurationKeysPublic { public static final String HADOOP_SECURITY_GROUP_SHELL_COMMAND_TIMEOUT_KEY = "hadoop.security.groups.shell.command.timeout"; /** + * @deprecated use + * {@link CommonConfigurationKeysPublic#HADOOP_SECURITY_GROUP_SHELL_COMMAND_TIMEOUT_KEY} + * instead. + */ + public static final String HADOOP_SECURITY_GROUP_SHELL_COMMAND_TIMEOUT_SECS = + HADOOP_SECURITY_GROUP_SHELL_COMMAND_TIMEOUT_KEY; + /** * @see * * core-default.xml */ public static final long - HADOOP_SECURITY_GROUP_SHELL_COMMAND_TIMEOUT_DEFAULT = - 0L; + HADOOP_SECURITY_GROUP_SHELL_COMMAND_TIMEOUT_DEFAULT = + 0L; + /** + * @deprecated use + * {@link CommonConfigurationKeysPublic#HADOOP_SECURITY_GROUP_SHELL_COMMAND_TIMEOUT_DEFAULT} + * instead. + */ + public static final long + HADOOP_SECURITY_GROUP_SHELL_COMMAND_TIMEOUT_SECS_DEFAULT = + HADOOP_SECURITY_GROUP_SHELL_COMMAND_TIMEOUT_DEFAULT; /** * @see * --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org