Merge lp://staging/~alecu/ubuntuone-storage-protocol/timestamp-autofix-1-6 into lp://staging/ubuntuone-storage-protocol/stable-1-6
Proposed by
Alejandro J. Cura
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Natalia Bidart | ||||||||
Approved revision: | 136 | ||||||||
Merged at revision: | 136 | ||||||||
Proposed branch: | lp://staging/~alecu/ubuntuone-storage-protocol/timestamp-autofix-1-6 | ||||||||
Merge into: | lp://staging/ubuntuone-storage-protocol/stable-1-6 | ||||||||
Diff against target: |
344 lines (+245/-5) 3 files modified
tests/test_client.py (+145/-3) ubuntuone/storageprotocol/client.py (+30/-2) ubuntuone/storageprotocol/utils.py (+70/-0) |
||||||||
To merge this branch: | bzr merge lp://staging/~alecu/ubuntuone-storage-protocol/timestamp-autofix-1-6 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Diego Sarmentero (community) | Abstain | ||
Review via email: mp+81791@code.staging.launchpad.net |
Commit message
Do a HEAD request on the server to get accurate timestamp (LP: #692597)
Description of the change
Do a HEAD request on the server to get accurate timestamp (LP: #692597)
To post a comment you must log in.
Text conflict in setup.py client. py storageprotocol /client. py
Text conflict in tests/test_
Text conflict in ubuntuone/
3 conflicts encountered.