Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/libcloud into trunk
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/912180d4 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/912180d4 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/912180d4 Branch: refs/heads/trunk Commit: 912180d40e6ac7e4d617ff79d9d9c89dde88aa57 Parents: e226af2 60b5661 Author: Tomaz Muraus <[email protected]> Authored: Wed Dec 30 14:40:43 2015 +0800 Committer: Tomaz Muraus <[email protected]> Committed: Wed Dec 30 14:40:43 2015 +0800 ---------------------------------------------------------------------- .travis.yml | 6 ++ CHANGES.rst | 17 +++++- .../_supported_methods_block_storage.rst | 2 - .../_supported_methods_image_management.rst | 2 - .../_supported_methods_key_pair_management.rst | 2 - docs/compute/_supported_methods_main.rst | 2 - docs/compute/_supported_providers.rst | 2 - docs/dns/_supported_methods.rst | 2 + docs/dns/_supported_providers.rst | 2 + libcloud/common/dimensiondata.py | 2 +- libcloud/common/google.py | 5 +- libcloud/compute/drivers/dimensiondata.py | 55 ++++++++++++------ libcloud/compute/drivers/ec2.py | 18 ++++++ libcloud/data/pricing.json | 59 ++++++++++++++++---- ...bc_8dabe5a7d0e4_network_addPublicIpBlock.xml | 12 ++-- libcloud/test/compute/test_ec2.py | 8 +-- libcloud/test/dns/fixtures/cloudflare/nul.json | 10 ---- libcloud/test/dns/fixtures/cloudflare/nul_.json | 10 ++++ libcloud/test/dns/test_cloudflare.py | 3 +- 19 files changed, 157 insertions(+), 62 deletions(-) ----------------------------------------------------------------------
