summaryrefslogtreecommitdiff
path: root/swiftclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-02 10:35:20 +0000
committerGerrit Code Review <review@openstack.org>2016-05-02 10:35:20 +0000
commit6b065dd4a6c82e092382b64bc29f420527a134af (patch)
tree7ad902b7dc3811dd4da08d4758976189c5dee67e /swiftclient
parent38af5b173319325dfbd943bc5eb07cb75025a95b (diff)
parent4a6fa02c2832086d3ea5f7fff694c844da980928 (diff)
downloadpython-swiftclient-6b065dd4a6c82e092382b64bc29f420527a134af.tar.gz
Merge "Identify segments uploaded via swiftclient"
Diffstat (limited to 'swiftclient')
-rw-r--r--swiftclient/service.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/swiftclient/service.py b/swiftclient/service.py
index 7d6f6be..f7f5815 100644
--- a/swiftclient/service.py
+++ b/swiftclient/service.py
@@ -1657,10 +1657,13 @@ class SwiftService(object):
fp.seek(segment_start)
contents = LengthWrapper(fp, segment_size, md5=options['checksum'])
- etag = conn.put_object(segment_container,
- segment_name, contents,
- content_length=segment_size,
- response_dict=results_dict)
+ etag = conn.put_object(
+ segment_container,
+ segment_name,
+ contents,
+ content_length=segment_size,
+ content_type='application/swiftclient-segment',
+ response_dict=results_dict)
if options['checksum'] and etag and etag != contents.get_md5sum():
raise SwiftError('Segment {0}: upload verification failed: '