Merge "Use timeout as whole seconds in swift plugin" into stable/newton

This commit is contained in:
Jenkins 2017-06-16 07:12:43 +00:00 committed by Gerrit Code Review
commit 7d39ad5c60
1 changed files with 1 additions and 1 deletions

View File

@ -113,7 +113,7 @@ class SwiftClientPlugin(client_plugin.ClientPlugin):
path = '/v1/AUTH_%s/%s/%s' % (self.context.tenant_id, container_name,
obj_name)
if timeout is None:
timeout = MAX_EPOCH - 60 - time.time()
timeout = int(MAX_EPOCH - 60 - time.time())
tempurl = swiftclient_utils.generate_temp_url(path, timeout, key,
method)
sw_url = parse.urlparse(self.client().url)