You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2017/01/09 04:52:47 UTC
[27/51] [abbrv] libcloud git commit: regen provider tables
regen provider tables
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/aa4dbdea
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/aa4dbdea
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/aa4dbdea
Branch: refs/heads/trunk
Commit: aa4dbdea1fc90a2593cc31d4a6ae2aac861041ba
Parents: 93e055b b5b8c3c
Author: Anthony Shaw <an...@apache.org>
Authored: Wed Jan 4 15:02:16 2017 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Wed Jan 4 15:02:16 2017 +1100
----------------------------------------------------------------------
docs/compute/_supported_providers.rst | 2 +-
docs/loadbalancer/_supported_providers.rst | 2 +-
libcloud/common/base.py | 9 ---------
3 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/aa4dbdea/docs/compute/_supported_providers.rst
----------------------------------------------------------------------
diff --cc docs/compute/_supported_providers.rst
index 14909fd,481f511..b1e5f92
--- a/docs/compute/_supported_providers.rst
+++ b/docs/compute/_supported_providers.rst
@@@ -17,7 -17,7 +17,7 @@@ Provider D
`Cloudwatt`_ :doc:`Click </compute/drivers/cloudwatt>` CLOUDWATT single region driver :mod:`libcloud.compute.drivers.cloudwatt` :class:`CloudwattNodeDriver`
`DigitalOcean`_ :doc:`Click </compute/drivers/digital_ocean>` DIGITAL_OCEAN single region driver :mod:`libcloud.compute.drivers.digitalocean` :class:`DigitalOceanNodeDriver`
`DimensionData`_ :doc:`Click </compute/drivers/dimensiondata>` DIMENSIONDATA single region driver :mod:`libcloud.compute.drivers.dimensiondata` :class:`DimensionDataNodeDriver`
- `Amazon EC2`_ :doc:`Click </compute/drivers/ec2>` EC2 eu-central-1, us-west-1, us-west-2, ap-south-1, ap-northeast-1, ap-northeast-2, sa-east-1, us-east-2, us-east-1, eu-west-1, us-gov-west-1, ap-southeast-2, ap-southeast-1 :mod:`libcloud.compute.drivers.ec2` :class:`EC2NodeDriver`
-`Amazon EC2`_ :doc:`Click </compute/drivers/ec2>` EC2 ap-northeast-2, us-east-2, ap-southeast-1, ap-southeast-2, ap-south-1, eu-west-1, sa-east-1, us-east-1, us-west-2, us-gov-west-1, us-west-1, eu-central-1, ap-northeast-1 :mod:`libcloud.compute.drivers.ec2` :class:`EC2NodeDriver`
++`Amazon EC2`_ :doc:`Click </compute/drivers/ec2>` EC2 ap-northeast-2, ap-southeast-1, us-gov-west-1, us-west-2, us-west-1, sa-east-1, us-east-1, us-east-2, eu-west-1, eu-central-1, ap-southeast-2, ap-northeast-1, ap-south-1 :mod:`libcloud.compute.drivers.ec2` :class:`EC2NodeDriver`
`Enomaly Elastic Computing Platform`_ ECP single region driver :mod:`libcloud.compute.drivers.ecp` :class:`ECPNodeDriver`
`ElasticHosts`_ ELASTICHOSTS single region driver :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsNodeDriver`
`Eucalyptus`_ EUCALYPTUS single region driver :mod:`libcloud.compute.drivers.ec2` :class:`EucNodeDriver`
http://git-wip-us.apache.org/repos/asf/libcloud/blob/aa4dbdea/docs/loadbalancer/_supported_providers.rst
----------------------------------------------------------------------
diff --cc docs/loadbalancer/_supported_providers.rst
index 22df336,35f5069..d51bcdd
--- a/docs/loadbalancer/_supported_providers.rst
+++ b/docs/loadbalancer/_supported_providers.rst
@@@ -12,7 -12,7 +12,7 @@@ Provider
`Google Compute Engine Load Balancer`_ :doc:`Click </loadbalancer/drivers/gce>` GCE single region driver :mod:`libcloud.loadbalancer.drivers.gce` :class:`GCELBDriver`
`GoGrid LB`_ GOGRID single region driver :mod:`libcloud.loadbalancer.drivers.gogrid` :class:`GoGridLBDriver`
`Ninefold LB`_ NINEFOLD single region driver :mod:`libcloud.loadbalancer.drivers.ninefold` :class:`NinefoldLBDriver`
- `Rackspace LB`_ RACKSPACE hkg, iad, dfw, syd, ord, lon :mod:`libcloud.loadbalancer.drivers.rackspace` :class:`RackspaceLBDriver`
-`Rackspace LB`_ RACKSPACE ord, syd, dfw, iad, hkg, lon :mod:`libcloud.loadbalancer.drivers.rackspace` :class:`RackspaceLBDriver`
++`Rackspace LB`_ RACKSPACE syd, iad, dfw, lon, hkg, ord :mod:`libcloud.loadbalancer.drivers.rackspace` :class:`RackspaceLBDriver`
`Softlayer Load Balancing`_ SOFTLAYER single region driver :mod:`libcloud.loadbalancer.drivers.softlayer` :class:`SoftlayerLBDriver`
====================================== ================================================== ================= ============================ ================================================== ==============================
http://git-wip-us.apache.org/repos/asf/libcloud/blob/aa4dbdea/libcloud/common/base.py
----------------------------------------------------------------------
diff --cc libcloud/common/base.py
index 3f403fa,bff343e..eb3875f
--- a/libcloud/common/base.py
+++ b/libcloud/common/base.py
@@@ -193,12 -193,8 +193,7 @@@ class Response(object)
:rtype: ``bool``
:return: ``True`` or ``False``
"""
- <<<<<<< HEAD
-- # See - https://github.com/kennethreitz/requests/issues/2417
-- #pylint: disable=E1101
- =======
+ # pylint: disable=E1101
- >>>>>>> github-923
return self.status in [requests.codes.ok, requests.codes.created,
httplib.OK, httplib.CREATED, httplib.ACCEPTED]
@@@ -436,11 -432,7 +431,7 @@@ class Connection(object)
if getattr(self, 'base_url', None) and base_url is None:
(host, port,
secure, request_path) = \
- <<<<<<< HEAD
-- self._tuple_from_url(getattr(self, 'base_url'))
- =======
+ self._tuple_from_url(getattr(self, 'base_url'))
- >>>>>>> github-923
elif base_url is not None:
(host, port,
secure, request_path) = self._tuple_from_url(base_url)