You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2014/02/20 19:43:37 UTC
svn commit: r1570298 - in
/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common:
CHANGES.txt
src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
Author: jing9
Date: Thu Feb 20 18:43:37 2014
New Revision: 1570298
URL: http://svn.apache.org/r1570298
Log:
HADOOP-10348. Merge change r1570297 from branch-2.
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1570298&r1=1570297&r2=1570298&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt Thu Feb 20 18:43:37 2014
@@ -19,6 +19,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10343. Change info to debug log in LossyRetryInvocationHandler. (arpit)
+ HADOOP-10348. Deprecate hadoop.ssl.configuration in branch-2, and remove
+ it in trunk. (Haohui Mai via jing9)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java?rev=1570298&r1=1570297&r2=1570298&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java (original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java Thu Feb 20 18:43:37 2014
@@ -268,7 +268,11 @@ public class CommonConfigurationKeysPubl
public static final String HADOOP_SECURITY_AUTH_TO_LOCAL =
"hadoop.security.auth_to_local";
+ @Deprecated
+ /** Only used by HttpServer. */
public static final String HADOOP_SSL_ENABLED_KEY = "hadoop.ssl.enabled";
+ @Deprecated
+ /** Only used by HttpServer. */
public static final boolean HADOOP_SSL_ENABLED_DEFAULT = false;