Merge "Fix memory explosion in multi-store image tests"
diff --git a/tempest/lib/services/object_storage/object_client.py b/tempest/lib/services/object_storage/object_client.py
index 6970c0a..1d38153 100644
--- a/tempest/lib/services/object_storage/object_client.py
+++ b/tempest/lib/services/object_storage/object_client.py
@@ -166,7 +166,6 @@
conn = httplib.HTTPSConnection(parsed_url.netloc,
context=context)
else:
- conn = httplib.HTTPConnection(parsed_url.netloc,
- context=context)
+ conn = httplib.HTTPConnection(parsed_url.netloc)
return conn