Merge commit '6ddd2bd81c8a79fb5456ba857f265ef16ac11910' into LIBCLOUD-781_containers
# Conflicts: # CHANGES.rst Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/c8024ade Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/c8024ade Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/c8024ade Branch: refs/heads/trunk Commit: c8024adef46a19f6c058ee83e987f6f1e07c8614 Parents: f1674de 6ddd2bd Author: anthony-shaw <[email protected]> Authored: Mon Dec 28 20:58:50 2015 +1100 Committer: anthony-shaw <[email protected]> Committed: Mon Dec 28 20:58:50 2015 +1100 ---------------------------------------------------------------------- docs/compute/_supported_methods_block_storage.rst | 2 -- docs/compute/_supported_methods_image_management.rst | 2 -- docs/compute/_supported_methods_key_pair_management.rst | 2 -- docs/compute/_supported_methods_main.rst | 2 -- docs/compute/_supported_providers.rst | 2 -- libcloud/compute/drivers/dimensiondata.py | 7 ++++--- libcloud/compute/drivers/ec2.py | 10 ++++++++++ libcloud/test/dns/fixtures/cloudflare/nul.json | 10 ---------- libcloud/test/dns/fixtures/cloudflare/nul_.json | 10 ++++++++++ libcloud/test/dns/test_cloudflare.py | 3 ++- 10 files changed, 26 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
