Merge branch 'github-923' into github-728
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/93e055bb Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/93e055bb Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/93e055bb Branch: refs/heads/trunk Commit: 93e055bbce64113fedab9043a997bf08a1307d7b Parents: ed69b73 b46ecef Author: Anthony Shaw <anthonys...@apache.org> Authored: Wed Jan 4 14:53:33 2017 +1100 Committer: Anthony Shaw <anthonys...@apache.org> Committed: Wed Jan 4 14:53:33 2017 +1100 ---------------------------------------------------------------------- .travis.yml | 5 +++-- contrib/generate_provider_feature_matrix_table.py | 5 ++--- docs/compute/_supported_providers.rst | 2 +- docs/loadbalancer/_supported_providers.rst | 2 +- libcloud/common/base.py | 8 ++++++++ libcloud/httplib_ssl.py | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/93e055bb/libcloud/common/base.py ---------------------------------------------------------------------- diff --cc libcloud/common/base.py index bff343e,eb3875f..3f403fa --- a/libcloud/common/base.py +++ b/libcloud/common/base.py @@@ -193,8 -193,7 +193,12 @@@ 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] @@@ -432,7 -431,7 +436,11 @@@ 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)
