Merge branch 'trunk' into LIBCLOUD-781_containers
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/69cd184a Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/69cd184a Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/69cd184a Branch: refs/heads/trunk Commit: 69cd184adffab9edb3e566eaa952eca4ae71ee20 Parents: edb1265 60b5661 Author: anthony-shaw <[email protected]> Authored: Mon Dec 28 21:19:04 2015 +1100 Committer: anthony-shaw <[email protected]> Committed: Mon Dec 28 21:19:04 2015 +1100 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 2 -- libcloud/data/pricing.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) ----------------------------------------------------------------------
