← Back to branch summary

~ubuntu-branches/ubuntu/vivid/swift/vivid-updates

« back to all changes in this revision

Viewing changes to swift/account/server.py

  • Committer: Package Import Robot
  • Author(s): James Page, Chuck Short, James Page
  • Date: 2014-10-06 10:06:11 UTC
  • mfrom: (1.2.31)
  • Revision ID: package-import@ubuntu.com-20141006100611-wdzkkuoru7ubtlml
Tags: 2.1.0-0ubuntu1
[ Chuck Short ]
* debian/patches/fix-doc-no-network.patch: Refreshed.
* debian/control: Add python-oslosphinx as a build dependency.

[ James Page ]
* New upstream release for OpenStack Juno.
* d/copyright: Add linebreaks to fixup file-without-copyright-
  information warning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
swift/account/server.py
38
38
    HTTPPreconditionFailed, HTTPConflict, Request, \
39
39
    HTTPInsufficientStorage, HTTPException
40
40
from swift.common.request_helpers import is_sys_or_user_meta
41
 
from swift.common.storage_policy import POLICY_INDEX
42
41
 
43
42
 
44
43
class AccountController(object):
110
109
            else:
111
110
                timestamp = valid_timestamp(req)
112
111
            pending_timeout = None
113
 
            container_policy_index = req.headers.get(POLICY_INDEX, 0)
 
112
            container_policy_index = \
 
113
                req.headers.get('X-Backend-Storage-Policy-Index', 0)
114
114
            if 'x-trans-id' in req.headers:
115
115
                pending_timeout = 3
116
116
            broker = self._get_account_broker(drive, part, account,