Merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/wait-for-it into lp://qastaging/ubuntuone-control-panel
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 304 |
| Merged at revision: | 305 |
| Proposed branch: | lp://qastaging/~nataliabidart/ubuntuone-control-panel/wait-for-it |
| Merge into: | lp://qastaging/ubuntuone-control-panel |
| Diff against target: |
455 lines (+54/-194) 8 files modified
ubuntuone/controlpanel/backend.py (+4/-1) ubuntuone/controlpanel/dbustests/test_sd_client/test_linux.py (+0/-94) ubuntuone/controlpanel/gui/qt/folders.py (+2/-1) ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+2/-1) ubuntuone/controlpanel/sd_client/__init__.py (+6/-13) ubuntuone/controlpanel/sd_client/linux.py (+0/-46) ubuntuone/controlpanel/tests/test_backend.py (+34/-21) ubuntuone/controlpanel/tests/test_sd_client.py (+6/-17) |
| To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/wait-for-it |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brian Curtin (community) | Approve | ||
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Make use of the new feature from syncdaemon where 'refresh_volumes'
returns a deferred that gets fired when the server info is ready
(LP: #851810).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1