You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by rb...@apache.org on 2015/05/27 05:51:51 UTC
tez git commit: TEZ-2450 breaks Hadoop 2.2 and 2.4 compatability
(rbalamohan)
Repository: tez
Updated Branches:
refs/heads/master 9dabf9476 -> dac59a2aa
TEZ-2450 breaks Hadoop 2.2 and 2.4 compatability (rbalamohan)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/dac59a2a
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/dac59a2a
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/dac59a2a
Branch: refs/heads/master
Commit: dac59a2aa71aab5daaa6fabdda9d8f48539e1bda
Parents: 9dabf94
Author: Rajesh Balamohan <rb...@apache.org>
Authored: Wed May 27 09:22:43 2015 +0530
Committer: Rajesh Balamohan <rb...@apache.org>
Committed: Wed May 27 09:22:43 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../src/main/java/org/apache/tez/http/SSLFactory.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/dac59a2a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5f5dd48..484f78d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ INCOMPATIBLE CHANGES
TEZ-2468. Change the minimum Java version to Java 7.
ALL CHANGES:
+ TEZ-2490. TEZ-2450 breaks Hadoop 2.2 and 2.4 compatability.
TEZ-2450. support async http clients in ordered & unordered inputs.
TEZ-2454. Change FetcherOrderedGroup to work as Callables instead of blocking threads.
TEZ-2466. tez-history-parser breaks hadoop 2.2 compatability.
http://git-wip-us.apache.org/repos/asf/tez/blob/dac59a2a/tez-runtime-library/src/main/java/org/apache/tez/http/SSLFactory.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/http/SSLFactory.java b/tez-runtime-library/src/main/java/org/apache/tez/http/SSLFactory.java
index f23739b..9751463 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/http/SSLFactory.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/http/SSLFactory.java
@@ -37,11 +37,9 @@ import java.io.IOException;
import java.net.HttpURLConnection;
import java.security.GeneralSecurityException;
-import static org.apache.hadoop.security.ssl.SSLFactory.DEFAULT_SSL_ENABLED_PROTOCOLS;
import static org.apache.hadoop.security.ssl.SSLFactory.DEFAULT_SSL_REQUIRE_CLIENT_CERT;
import static org.apache.hadoop.security.ssl.SSLFactory.KEYSTORES_FACTORY_CLASS_KEY;
import static org.apache.hadoop.security.ssl.SSLFactory.SSL_CLIENT_CONF_KEY;
-import static org.apache.hadoop.security.ssl.SSLFactory.SSL_ENABLED_PROTOCOLS;
import static org.apache.hadoop.security.ssl.SSLFactory.SSL_HOSTNAME_VERIFIER_KEY;
import static org.apache.hadoop.security.ssl.SSLFactory.SSL_REQUIRE_CLIENT_CERT_KEY;
import static org.apache.hadoop.security.ssl.SSLFactory.SSL_SERVER_CONF_KEY;
@@ -60,6 +58,9 @@ import static org.apache.hadoop.security.ssl.SSLFactory.SSL_SERVER_CONF_KEY;
@InterfaceStability.Evolving
public class SSLFactory implements ConnectionConfigurator {
+ public static final String SSL_ENABLED_PROTOCOLS = "hadoop.ssl.enabled.protocols";
+ public static final String DEFAULT_SSL_ENABLED_PROTOCOLS = "TLSv1";
+
private Configuration conf;
private Mode mode;
private boolean requireClientCert;