Merge lp:~alecu/ubuntuone-client/timestamp-autofix-2-0 into lp:ubuntuone-client/stable-2-0
Proposed by
Alejandro J. Cura
Status: | Merged |
---|---|
Approved by: | Alejandro J. Cura |
Approved revision: | 1144 |
Merged at revision: | 1143 |
Proposed branch: | lp:~alecu/ubuntuone-client/timestamp-autofix-2-0 |
Merge into: | lp:ubuntuone-client/stable-2-0 |
Diff against target: |
237 lines (+80/-26) 3 files modified
Makefile.am (+1/-1) tests/syncdaemon/test_action_queue.py (+65/-12) ubuntuone/syncdaemon/action_queue.py (+14/-13) |
To merge this branch: | bzr merge lp:~alecu/ubuntuone-client/timestamp-autofix-2-0 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Diego Sarmentero (community) | Abstain | ||
Review via email: mp+82753@code.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)
This branch depends on:
* lp:~alecu/ubuntuone-storage-protocol/timestamp-autofix-2-0
* lp:~alecu/ubuntu-sso-client/timestamp-autofix-1-4
To build it on linux, point autogen to the dependent branches, like this:
./autogen.sh --with-
To post a comment you must log in.
Text conflict in tests/platform/ linux/eventlog/ test_zglog. py linux/test_ dbus.py linux/test_ messaging. py linux/test_ notification. py test_aggregator .py n/test_ action_ queue.py n/test_ interaction_ interfaces. py syncdaemon/ action_ queue.py
Text conflict in tests/platform/
Text conflict in tests/platform/
Text conflict in tests/platform/
Text conflict in tests/status/
Text conflict in tests/syncdaemo
Text conflict in tests/syncdaemo
Text conflict in ubuntuone/
8 conflicts encountered.