diff options
| -rw-r--r-- | .gitreview | 2 | ||||
| -rw-r--r-- | .zuul.yaml | 6 | ||||
| -rw-r--r-- | doc/requirements.txt | 3 | ||||
| -rw-r--r-- | glanceclient/common/http.py | 1 |
4 files changed, 7 insertions, 5 deletions
@@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 project=openstack/python-glanceclient.git @@ -35,7 +35,7 @@ s-object: true s-proxy: true # Hardcode glanceclient path so the job can be run on glance patches - zuul_work_dir: src/git.openstack.org/openstack/python-glanceclient + zuul_work_dir: src/opendev.org/openstack/python-glanceclient irrelevant-files: - ^doc/.*$ - ^releasenotes/.*$ @@ -74,7 +74,7 @@ s-object: true s-proxy: true # Hardcode glanceclient path so the job can be run on glance patches - zuul_work_dir: src/git.openstack.org/openstack/python-glanceclient + zuul_work_dir: src/opendev.org/openstack/python-glanceclient irrelevant-files: - ^doc/.*$ - ^releasenotes/.*$ @@ -173,7 +173,7 @@ # The "tips" jobs can be removed from the stable branch .zuul.yaml # files if someone is so inclined, but that would require manual # maintenance, so we do not do it by default. Another option is - # to define these jobs in the openstack-infra/project-config repo. + # to define these jobs in the openstack/project-config repo. # That would make us less agile in adjusting these tests, so we # aren't doing that either. - glanceclient-tox-py27-keystone-tips: diff --git a/doc/requirements.txt b/doc/requirements.txt index 4faabc1..0e2ed7a 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,5 +3,6 @@ # process, which may cause wedges in the gate later. openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD sphinxcontrib-apidoc>=0.2.0 # BSD diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py index 9ba806f..17d7cc7 100644 --- a/glanceclient/common/http.py +++ b/glanceclient/common/http.py @@ -270,6 +270,7 @@ class HTTPClient(_BaseHTTPClient): conn_url, data=data, headers=headers, + timeout=self.timeout, **kwargs) except requests.exceptions.Timeout as e: message = ("Error communicating with %(url)s: %(e)s" % |