diff --git a/CHANGES.md b/CHANGES.md index 013d837a..6d5f08a0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,11 @@ Apache CloudStack CloudMonkey Changelog --------------------------------------- +Version 5.3.4 +============= +This release includes +- Allow ssl version to be negotiated automatically + Version 5.3.3 ============= This release includes diff --git a/Dockerfile b/Dockerfile index 696974da..d36527ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER "Apache CloudStack" LABEL Description="Apache CloudStack CloudMonkey; Python based CloudStack command line interface" LABEL Vendor="Apache.org" LABEL License=ApacheV2 -LABEL Version=5.3.3 +LABEL Version=5.3.4 COPY . /cloudstack-cloudmonkey RUN pip install requests diff --git a/cloudmonkey/config.py b/cloudmonkey/config.py index c5faec26..47235ef0 100644 --- a/cloudmonkey/config.py +++ b/cloudmonkey/config.py @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. -__version__ = "5.3.3" +__version__ = "5.3.4" __description__ = "Command Line Interface for Apache CloudStack" __maintainer__ = "The Apache CloudStack Team" __maintaineremail__ = "dev@cloudstack.apache.org" diff --git a/cloudmonkey/requester.py b/cloudmonkey/requester.py index 914854fa..b4fed264 100644 --- a/cloudmonkey/requester.py +++ b/cloudmonkey/requester.py @@ -70,7 +70,7 @@ def login(url, username, password, domain="/", verifysslcert=False): sessionkey = '' session = requests.Session() - session.mount('https://', SSLAdapter(ssl.PROTOCOL_TLSv1)) + session.mount('https://', SSLAdapter()) try: resp = session.post(url, params=args, verify=verifysslcert) @@ -217,7 +217,7 @@ def sign_request(params, secret_key): args["signature"] = sign_request(args, credentials['secretkey']) session = requests.Session() - session.mount('https://', SSLAdapter(ssl.PROTOCOL_TLSv1)) + session.mount('https://', SSLAdapter()) try: response = session.get(url, params=args, verify=verifysslcert) diff --git a/docs/source/conf.py b/docs/source/conf.py index 9c30ccb3..e9e79a85 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -55,7 +55,7 @@ # built documents. # # The short X.Y version. -version = '5.3.3' +version = '5.3.4' # The full version, including alpha/beta/rc tags. release = version