Merge "Pass socket timeout to swiftclient"

requirements.txt

@@ -13,7 +13,7 @@ python-cinderclient<1.2
 python-neutronclient>=2.3.10
 python-troveclient
 python-ironicclient>=0.5.1
-python-swiftclient
+python-swiftclient>=2.5.0
 python-designateclient>=1.3.0
 
 dogpile.cache>=0.5.3

shade/__init__.py

@@ -694,6 +694,7 @@ class OpenStackCloud(object):
                         auth_token=token,
                         object_storage_url=endpoint,
                         region_name=self.region_name),
+                    timeout=self.api_timeout,
                 )
             except OpenStackCloudException:
                 raise

shade/tests/unit/test_object.py

@@ -42,6 +42,7 @@ class TestObject(base.TestCase):
             preauthurl='danzig',
             preauthtoken='yankee',
             auth_version='2',
+            timeout=None,
             os_options=dict(
                 object_storage_url='danzig',
                 auth_token='yankee',