merge updates
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/1eed7289 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/1eed7289 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/1eed7289 Branch: refs/heads/trunk Commit: 1eed7289a2c56fccb6ef80d1a0097ba6bde88f1d Parents: 2a5cee3 0f67da8 Author: Anthony Shaw <anthonys...@apache.org> Authored: Sun Jun 26 09:35:07 2016 +1000 Committer: Anthony Shaw <anthonys...@apache.org> Committed: Sun Jun 26 09:35:07 2016 +1000 ---------------------------------------------------------------------- CHANGES.rst | 19 +++-- contrib/__init__.py | 0 demos/__init__.py | 0 demos/compute_demo.py | 2 +- demos/example_aliyun_ecs.py | 86 ++++++++++++++++++++ demos/example_aliyun_oss.py | 84 +++++++++++++++++++ demos/example_aliyun_slb.py | 56 +++++++++++++ demos/gce_demo.py | 2 +- docs/upgrade_notes.rst | 4 +- example_aliyun_ecs.py | 85 ------------------- example_aliyun_oss.py | 82 ------------------- example_aliyun_slb.py | 55 ------------- libcloud/compute/drivers/ecs.py | 57 +++++++++++++ .../ecs/describe_security_group_attributes.xml | 26 ++++++ libcloud/test/compute/test_ecs.py | 8 ++ tox.ini | 2 + 16 files changed, 337 insertions(+), 231 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/1eed7289/CHANGES.rst ----------------------------------------------------------------------
