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/c247ea85
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/c247ea85
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/c247ea85

Branch: refs/heads/trunk
Commit: c247ea85e504f606b4830f07da1b40921e5e4daf
Parents: 83c06fe 9ddaa91
Author: anthony-shaw <[email protected]>
Authored: Sun Jan 3 21:14:56 2016 +1100
Committer: anthony-shaw <[email protected]>
Committed: Sun Jan 3 21:14:56 2016 +1100

----------------------------------------------------------------------
 CHANGES.rst                                     | 26 +++++++-------
 docs/compute/drivers/auroracompute.rst          |  2 +-
 docs/compute/drivers/cloudstack.rst             |  6 ++--
 docs/compute/drivers/dimensiondata.rst          |  2 +-
 docs/compute/drivers/onapp.rst                  |  2 +-
 docs/compute/drivers/openstack.rst              |  2 +-
 docs/compute/drivers/packet.rst                 |  2 +-
 docs/conf.py                                    | 35 +++++++++++++++++-
 docs/development.rst                            |  2 +-
 docs/dns/drivers/digital_ocean.rst              |  2 +-
 docs/dns/drivers/dnsimple.rst                   |  6 ++--
 docs/dns/drivers/durabledns.rst                 |  4 +--
 docs/dns/drivers/godaddy.rst                    |  8 ++---
 docs/dns/drivers/liquidweb.rst                  |  4 +--
 docs/dns/drivers/pointdns.rst                   |  4 +--
 docs/dns/drivers/vultr.rst                      |  4 +--
 docs/dns/drivers/worldwidedns.rst               |  4 +--
 docs/dns/drivers/zonomi.rst                     |  4 +--
 .../examples/http_proxy/constructor_argument.py |  8 +++++
 docs/loadbalancer/drivers/dimensiondata.rst     |  2 +-
 docs/loadbalancer/drivers/elb.rst               | 14 ++++----
 docs/loadbalancer/drivers/gce.rst               |  6 ++--
 docs/loadbalancer/drivers/index.rst             |  4 +--
 docs/storage/drivers/auroraobjects.rst          |  6 ++--
 docs/storage/drivers/s3.rst                     |  2 +-
 docs/upgrade_notes.rst                          |  2 +-
 libcloud/common/abiquo.py                       |  2 +-
 libcloud/common/base.py                         |  2 +-
 libcloud/common/dimensiondata.py                | 24 +++++++------
 libcloud/common/exceptions.py                   |  2 +-
 libcloud/common/google.py                       | 11 +++---
 libcloud/common/onapp.py                        |  5 +--
 libcloud/common/openstack.py                    | 38 +++++++++++---------
 libcloud/common/openstack_identity.py           | 10 +++---
 libcloud/compute/deployment.py                  |  2 +-
 libcloud/compute/drivers/abiquo.py              |  4 +--
 libcloud/compute/drivers/azure.py               | 36 ++++++++++---------
 libcloud/compute/drivers/cloudsigma.py          |  8 ++---
 libcloud/compute/drivers/cloudstack.py          | 17 ++++-----
 libcloud/compute/drivers/dimensiondata.py       | 10 ++++--
 libcloud/compute/drivers/ec2.py                 |  6 ++--
 libcloud/compute/drivers/ecp.py                 |  4 +--
 libcloud/compute/drivers/gce.py                 | 24 ++++++-------
 libcloud/compute/drivers/hostvirtual.py         |  9 +++--
 libcloud/compute/drivers/ibm_sce.py             |  3 +-
 libcloud/compute/drivers/linode.py              | 24 ++++++-------
 libcloud/compute/drivers/nephoscale.py          | 14 ++++----
 libcloud/compute/drivers/profitbricks.py        |  4 +--
 libcloud/compute/drivers/runabove.py            |  4 +--
 libcloud/compute/drivers/vsphere.py             |  2 +-
 libcloud/dns/drivers/cloudflare.py              |  2 +-
 libcloud/dns/drivers/pointdns.py                |  2 +-
 libcloud/dns/types.py                           |  2 --
 libcloud/loadbalancer/base.py                   |  2 +-
 libcloud/storage/base.py                        |  4 +--
 libcloud/storage/drivers/google_storage.py      | 18 +++++++---
 libcloud/storage/drivers/s3.py                  |  2 +-
 libcloud/test/compute/test_elasticstack.py      | 10 ------
 libcloud/utils/files.py                         |  2 +-
 libcloud/utils/networking.py                    |  2 +-
 tox.ini                                         |  2 +-
 61 files changed, 267 insertions(+), 209 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/c247ea85/CHANGES.rst
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/libcloud/blob/c247ea85/libcloud/common/base.py
----------------------------------------------------------------------

Reply via email to