Merge "Remove unused code in swift/obj/server.py"

This commit is contained in:
Jenkins 2015-07-29 19:13:58 +00:00 committed by Gerrit Code Review
commit 5fda35c0b4

View File

@ -685,9 +685,6 @@ class ObjectController(BaseStorageServer):
"""Handle HTTP GET requests for the Swift Object Server."""
device, partition, account, container, obj, policy = \
get_name_and_placement(request, 5, 5, True)
keep_cache = self.keep_cache_private or (
'X-Auth-Token' not in request.headers and
'X-Storage-Token' not in request.headers)
try:
disk_file = self.get_diskfile(
device, partition, account, container, obj,