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 <ste...@apache.org> Authored: Mon Oct 22 11:06:56 2018 +0100 Committer: Akira Ajisaka <aajis...@apache.org> 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 * <a href="{@docRoot}/../hadoop-project-dist/hadoop-common/core-default.xml"> * core-default.xml</a> */ 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 * <a href="{@docRoot}/../hadoop-project-dist/hadoop-common/core-default.xml"> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org