Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/libcloud into 
trunk   Closes #795


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/48517a96
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/48517a96
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/48517a96

Branch: refs/heads/trunk
Commit: 48517a9608b7b89baabeb8542c77512d6c17b202
Parents: 5027c2b 8493954
Author: anthony-shaw <anthonys...@apache.org>
Authored: Mon Jun 6 21:42:11 2016 +1000
Committer: anthony-shaw <anthonys...@apache.org>
Committed: Mon Jun 6 21:42:57 2016 +1000

----------------------------------------------------------------------
 CHANGES.rst                                     |  36 +-
 README.rst                                      |   3 +
 libcloud/common/dnspod.py                       |  78 +++++
 libcloud/common/openstack_identity.py           | 161 ++++++++-
 libcloud/compute/drivers/cloudstack.py          |  23 +-
 libcloud/compute/drivers/gce.py                 |   3 +
 libcloud/compute/drivers/libvirt_driver.py      |  32 +-
 libcloud/dns/drivers/dnspod.py                  | 347 +++++++++++++++++++
 libcloud/dns/types.py                           |   1 +
 libcloud/loadbalancer/drivers/elb.py            |   9 +-
 libcloud/test/common/test_openstack_identity.py |  45 ++-
 .../cloudstack/createVolume_withvolumetype.json |   1 +
 .../listDiskOfferings_withvolumetype.json       |   1 +
 .../cloudstack/listZones_withvolumetype.json    |   1 +
 libcloud/test/compute/test_cloudstack.py        |  24 ++
 .../fixtures/dnspod/create_zone_success.json    |  12 +
 .../delete_record_record_does_not_exist.json    |   1 +
 .../fixtures/dnspod/delete_record_success.json  |   0
 .../fixtures/dnspod/delete_zone_success.json    |   0
 .../dns/fixtures/dnspod/empty_zones_list.json   |   1 +
 .../test/dns/fixtures/dnspod/get_record.json    |  26 ++
 .../dns/fixtures/dnspod/get_zone_success.json   |  28 ++
 .../test/dns/fixtures/dnspod/list_records.json  |  93 +++++
 .../test/dns/fixtures/dnspod/list_zones.json    |  42 +++
 .../fixtures/dnspod/record_already_exists.json  |   8 +
 .../fixtures/dnspod/zone_already_exists.json    |   1 +
 .../fixtures/dnspod/zone_does_not_exist.json    |   1 +
 libcloud/test/dns/test_dnspod.py                | 266 ++++++++++++++
 libcloud/test/secrets.py-dist                   |   1 +
 29 files changed, 1226 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


Reply via email to