Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ MAINTAINER "Apache CloudStack" <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion cloudmonkey/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__ = "[email protected]"
Expand Down
4 changes: 2 additions & 2 deletions cloudmonkey/requester.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down