Merge branch 'trunk' of https://github.com/apache/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/43fbf566 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/43fbf566 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/43fbf566 Branch: refs/heads/trunk Commit: 43fbf566720bfa6710959234628d0dad2f1c26a9 Parents: ee6f984 800189e Author: Anthony Shaw <anthony.p.s...@gmail.com> Authored: Thu Nov 12 12:19:41 2015 +1100 Committer: Anthony Shaw <anthony.p.s...@gmail.com> Committed: Thu Nov 12 12:19:41 2015 +1100 ---------------------------------------------------------------------- CHANGES.rst | 9 ++ contrib/update_google_prices.py | 87 ++++++++++++++ contrib/utils.py | 48 ++++++++ contrib/utils_test.py | 65 +++++++++++ libcloud/compute/drivers/cloudstack.py | 3 +- libcloud/compute/drivers/gce.py | 2 +- libcloud/data/pricing.json | 158 ++++++++++++++++++++++---- libcloud/test/compute/test_cloudstack.py | 4 + 8 files changed, 352 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
