Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/libcloud into
trunk
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/622e2597
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/622e2597
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/622e2597
Branch: refs/heads/trunk
Commit: 622e2597ac96fe45ea31e6c1328c7c047bb5fbb1
Parents: a64678a 4ba3f8d
Author: Tomaz Muraus <[email protected]>
Authored: Fri Nov 6 19:07:44 2015 +0100
Committer: Tomaz Muraus <[email protected]>
Committed: Fri Nov 6 19:07:44 2015 +0100
----------------------------------------------------------------------
.editorconfig | 19 +++++++++++
CHANGES.rst | 16 +++++++++
docs/compute/drivers/auroracompute.rst | 21 ++++++++++--
.../auroracompute/instantiate_driver_region.py | 9 +++++
libcloud/compute/base.py | 12 +++++--
libcloud/compute/drivers/auroracompute.py | 34 +++++++++++++++++--
libcloud/compute/drivers/cloudstack.py | 35 ++++++++++++++++++--
libcloud/compute/drivers/ec2.py | 22 ++++++++++--
libcloud/compute/drivers/openstack.py | 20 +++++++++--
libcloud/compute/drivers/rackspace.py | 11 ++++--
libcloud/compute/types.py | 26 +++++++++++----
.../compute/fixtures/ec2/describe_snapshots.xml | 2 +-
libcloud/test/compute/test_auroracompute.py | 28 +++++++++++++++-
libcloud/test/compute/test_ec2.py | 6 +++-
libcloud/test/compute/test_openstack.py | 4 ++-
15 files changed, 237 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/622e2597/CHANGES.rst
----------------------------------------------------------------------
diff --cc CHANGES.rst
index a72ef62,f12f802..0fabb77
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@@ -7,14 -7,10 +7,18 @@@ Changes with Apache Libcloud in develop
General
~~~~~~~
+ - Added .editorconfig file for easier editing
+ (GITHUB-625)
+ [Misha Brukman]
+
+- Fix a bug with Libcloud accidentally setting paramiko root logger level to
+ DEBUG (this should only happen if ``LIBCLOUD_DEBUG`` environment variable is
+ provided).
+
+ Reported by John Bresnahan.
+ (LIBCLOUD-765)
+ [Tomaz Muraus, John Bresnahan]
+
Compute
~~~~~~~
@@@ -23,6 -19,14 +27,14 @@@
(GITHUB-617)
[Wido den Hollander]
+ - Return proper volume state for CloudStack volumes.
+ (GITHUB-615, LIBCLOUD-764)
+ [Wido den Hollander]
+
+ - Add support for multiple regions in Aurora compute driver
+ (GITHUB-623)
+ [Wido den Hollander]
-
++
Storage
~~~~~~~
