Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/libcloud into feature_drs
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/805a2726 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/805a2726 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/805a2726 Branch: refs/heads/trunk Commit: 805a27262417e5a23597864c808c90c12fcc5306 Parents: bc4482a 3d40806 Author: mitch <[email protected]> Authored: Tue Nov 13 11:31:32 2018 -0500 Committer: mitch <[email protected]> Committed: Tue Nov 13 11:31:32 2018 -0500 ---------------------------------------------------------------------- CHANGES.rst | 15 +++++++++++++++ doap_libcloud.rdf | 14 ++++++++++++++ docs/committer_guide.rst | 2 +- docs/conf.py | 4 ++-- libcloud/__init__.py | 2 +- libcloud/backup/providers.py | 2 -- libcloud/backup/types.py | 1 - libcloud/common/openstack_identity.py | 2 +- libcloud/compute/drivers/ec2.py | 14 +++++++++++--- libcloud/test/common/test_openstack_identity.py | 13 +++++++++++++ .../fixtures/openstack_identity/v3/v3_users_b.json | 17 +++++++++++++++++ libcloud/test/compute/test_ec2.py | 16 ++++++++++++++++ tox.ini | 6 ++++++ 13 files changed, 97 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
