Merge lp:~dweimer/swift/lp837428 into lp:~hudson-openstack/swift/trunk
Proposed by
Doug Weimer
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | John Dickinson | ||||
Approved revision: | 350 | ||||
Merged at revision: | 351 | ||||
Proposed branch: | lp:~dweimer/swift/lp837428 | ||||
Merge into: | lp:~hudson-openstack/swift/trunk | ||||
Diff against target: |
170 lines (+25/-15) 2 files modified
swift/proxy/server.py (+6/-4) test/unit/proxy/test_server.py (+19/-11) |
||||
To merge this branch: | bzr merge lp:~dweimer/swift/lp837428 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John Dickinson | Approve | ||
gholt (community) | Approve | ||
Review via email: mp+73429@code.launchpad.net |
Description of the change
Proposed fix for bug #837428.
To test:
Create an object without an x-timestamp or x-put-timestamp header and request the object with the X-newest header.
Without the patch, the proxy will return a 404 object not found even though the storage nodes return the object to the proxy.
With the patch, the proxy will return the first object received unless an object with a newer timestamp header exists.
To post a comment you must log in.
I've proposed a merge to your branch that adds a test that would fail if your code wasn't present and does a quick PEP8 update. The merge proposal is at https:/ /code.launchpad .net/~gholt/ swift/lp837428/ +merge/ 73439 and you can merge it into your branch by 'cd <branch>; bzr merge lp:~gholt/swift/lp837428' and then push when you're ready.
Also, if you could ensure you or your company has signed the CLA http:// wiki.openstack. org/HowToContri bute and add your name and info to http:// wiki.openstack. org/Contributor s
Thanks!