cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/master to 1f87057
Date Tue, 28 Apr 2015 12:24:54 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 7843a092f -> 1f8705724


marvin: set ssl cert verification only if ssl module supports it

ssl._create_unverified_context is not available for all Python 2.x environment,
the fix would check if the attribute is available before trying to set it

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1f870572
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f870572
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f870572

Branch: refs/heads/master
Commit: 1f87057248803bdce060ab5fc549db587579a70e
Parents: 7843a09
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Tue Apr 28 14:23:09 2015 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Tue Apr 28 14:24:26 2015 +0200

----------------------------------------------------------------------
 tools/marvin/marvin/lib/vcenter.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f870572/tools/marvin/marvin/lib/vcenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/vcenter.py b/tools/marvin/marvin/lib/vcenter.py
index 85b50b3..f7e0987 100644
--- a/tools/marvin/marvin/lib/vcenter.py
+++ b/tools/marvin/marvin/lib/vcenter.py
@@ -19,7 +19,8 @@ from pyVmomi import vim, vmodl
 from pyVim import connect
 import atexit
 import ssl
-ssl._create_default_https_context = ssl._create_unverified_context
+if hasattr(ssl, '_create_unverified_context'):
+    ssl._create_default_https_context = ssl._create_unverified_context
 
 
 class Vcenter():


Mime
View raw message