From c84179154d90247c784ddaf76cbd84eeaeaf3cca Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 20 Nov 2015 08:54:53 -0500 Subject: [PATCH] Bump os-client-config requirement The 1.11.0 release of os-client-config contains a bugfix for the swift api timeout paramter issue. Be explicit that this version of os-client-config is required for proper operation of shade. The 1.11.1 release contains a bugfix for the 1.11.0 release. Change-Id: Iabcb62593143473a7459ad01122a734d4230ab77 --- requirements.txt | 2 +- shade/tests/unit/test_object.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 53190d185..c41f168f5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ munch decorator jsonpatch ipaddress -os-client-config>=1.10.1 +os-client-config>=1.11.1 requestsexceptions>=1.1.1 six diff --git a/shade/tests/unit/test_object.py b/shade/tests/unit/test_object.py index a3749be51..3daedf91e 100644 --- a/shade/tests/unit/test_object.py +++ b/shade/tests/unit/test_object.py @@ -48,7 +48,6 @@ class TestObject(base.TestCase): preauthurl='danzig', preauthtoken='yankee', auth_version=mock.ANY, - timeout=None, os_options=dict( object_storage_url='danzig', auth_token='yankee',