Merge branch 'upstream' into trunk Closes #945
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/fe34a54e Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/fe34a54e Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/fe34a54e Branch: refs/heads/trunk Commit: fe34a54e0893973d8b70738a1ba01837be5e2992 Parents: bbba0ee f5f246e Author: hequn <[email protected]> Authored: Wed Nov 16 09:38:39 2016 +0800 Committer: Anthony Shaw <[email protected]> Committed: Wed Nov 16 13:17:45 2016 +1100 ---------------------------------------------------------------------- CHANGES.rst | 13 ++++++ docs/compute/_supported_providers.rst | 2 +- docs/compute/drivers/ec2.rst | 1 + libcloud/__init__.py | 2 +- libcloud/common/azure_arm.py | 2 +- libcloud/compute/drivers/ec2.py | 63 ++++++++++++++++++++++++++++++ libcloud/compute/types.py | 2 + 7 files changed, 82 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
