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/a9f9cb0c Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a9f9cb0c Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a9f9cb0c Branch: refs/heads/trunk Commit: a9f9cb0cefae2b09e09e9cb652245482e857df91 Parents: 1c5deaf f4c00ea Author: Anthony Shaw <anthonys...@apache.org> Authored: Fri Jan 13 11:52:20 2017 +1100 Committer: Anthony Shaw <anthonys...@apache.org> Committed: Fri Jan 13 11:52:20 2017 +1100 ---------------------------------------------------------------------- CHANGES.rst | 6 ++++++ libcloud/compute/drivers/vsphere.py | 8 +++++--- libcloud/storage/base.py | 20 +++---------------- libcloud/storage/drivers/s3.py | 2 +- libcloud/test/__init__.py | 34 ++++++++++++++++++++++++++++---- libcloud/test/storage/test_s3.py | 19 ++++++++++++++---- 6 files changed, 60 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
