ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [07/51] [abbrv] ambari git commit: AMBARI-17666. Fix python test error: cannot import name ensure_ssl_using_tls_v1 (adoroszlai via dlysnichenko)
Date Fri, 16 Dec 2016 22:02:15 GMT
AMBARI-17666. Fix python test error: cannot import name ensure_ssl_using_tls_v1 (adoroszlai
via dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a5b2f6f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a5b2f6f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a5b2f6f

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 4a5b2f6f5ad2315339ca4ccf26099968b76b16b9
Parents: aa16f5e
Author: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Authored: Fri Dec 16 16:40:29 2016 +0200
Committer: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Committed: Fri Dec 16 16:41:43 2016 +0200

----------------------------------------------------------------------
 .../common-services/HDFS/3.0.0/package/scripts/utils.py         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4a5b2f6f/ambari-server/src/main/resources/common-services/HDFS/3.0.0/package/scripts/utils.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/3.0.0/package/scripts/utils.py
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0/package/scripts/utils.py
index 4577ad2..f76935a 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/3.0.0/package/scripts/utils.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/3.0.0/package/scripts/utils.py
@@ -34,10 +34,11 @@ from resource_management.libraries.functions.curl_krb_request import curl_krb_re
 from resource_management.core.exceptions import Fail
 from resource_management.libraries.functions.namenode_ha_utils import get_namenode_states
 from resource_management.libraries.functions.show_logs import show_logs
-from ambari_commons.inet_utils import ensure_ssl_using_tls_v1
+from resource_management.libraries.script.script import Script
+from ambari_commons.inet_utils import ensure_ssl_using_protocol
 from zkfc_slave import ZkfcSlaveDefault
 
-ensure_ssl_using_tls_v1()
+ensure_ssl_using_protocol(Script.get_force_https_protocol())
 
 def safe_zkfc_op(action, env):
   """


Mime
View raw message