summaryrefslogtreecommitdiffstats
path: root/gluster/swift/obj
diff options
context:
space:
mode:
authorvenkata edara <redara@redhat.com>2017-11-22 13:35:46 +0530
committerPrashanth Pai <ppai@redhat.com>2017-11-22 09:07:11 +0000
commit488744a005fb399af8d094ad7a62c1917410398c (patch)
tree714441b43e09061fc339cae6a68de5c26f0fdf52 /gluster/swift/obj
parent8af00bf3fa5aa7cd29a53e5e43ea230c196d10b0 (diff)
Rebase to Swift 2.15.1 (pike)HEADmaster
Change-Id: I84ebb44c5c3cf2f80c50f2d4ae4bd92b619a4297 Signed-off-by: venkata edara <redara@redhat.com> Reviewed-on: https://review.gluster.org/18412 Reviewed-by: Prashanth Pai <ppai@redhat.com> Tested-by: Prashanth Pai <ppai@redhat.com>
Diffstat (limited to 'gluster/swift/obj')
-rw-r--r--gluster/swift/obj/diskfile.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gluster/swift/obj/diskfile.py b/gluster/swift/obj/diskfile.py
index be0669f..7ad5f26 100644
--- a/gluster/swift/obj/diskfile.py
+++ b/gluster/swift/obj/diskfile.py
@@ -1081,7 +1081,7 @@ class DiskFile(object):
X_OBJECT_TYPE, X_TYPE]
for key in sys_keys:
- if key in orig_metadata:
+ if key in orig_metadata and key not in metadata:
metadata[key] = orig_metadata[key]
if X_OBJECT_TYPE not in orig_metadata: