Merge branch 'trunk' into integration_testing
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/f278cca3 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f278cca3 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f278cca3 Branch: refs/heads/trunk Commit: f278cca31f3d8a527af12fa50b181b00bb5e7987 Parents: fb867e7 3dd6d01 Author: Anthony Shaw <anthonys...@apache.org> Authored: Tue Jan 10 15:03:38 2017 +1100 Committer: Anthony Shaw <anthonys...@apache.org> Committed: Tue Jan 10 15:03:38 2017 +1100 ---------------------------------------------------------------------- CHANGES.rst | 18 +++++++++++ libcloud/common/base.py | 3 ++ libcloud/httplib_ssl.py | 5 +-- libcloud/test/common/test_openstack.py | 5 +-- libcloud/test/test_connection.py | 47 +++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 4 deletions(-) ----------------------------------------------------------------------