Merge lp://qastaging/~diegosarmentero/ubuntuone-client/ubuntuone-client-timer into lp://qastaging/ubuntuone-client
Proposed by
Diego Sarmentero
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Diego Sarmentero | ||||
Approved revision: | 1333 | ||||
Merged at revision: | 1325 | ||||
Proposed branch: | lp://qastaging/~diegosarmentero/ubuntuone-client/ubuntuone-client-timer | ||||
Merge into: | lp://qastaging/ubuntuone-client | ||||
Diff against target: |
492 lines (+121/-84) 9 files modified
tests/platform/sync_menu/test_linux.py (+32/-17) tests/status/test_aggregator.py (+15/-0) tests/syncdaemon/test_main.py (+0/-14) tests/syncdaemon/test_status_listener.py (+2/-2) ubuntuone/platform/sync_menu/common.py (+0/-10) ubuntuone/platform/sync_menu/linux.py (+38/-23) ubuntuone/status/aggregator.py (+29/-3) ubuntuone/syncdaemon/main.py (+3/-13) ubuntuone/syncdaemon/status_listener.py (+2/-2) |
||||
To merge this branch: | bzr merge lp://qastaging/~diegosarmentero/ubuntuone-client/ubuntuone-client-timer | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alejandro J. Cura (community) | Approve | ||
Mike McCracken (community) | Approve | ||
Review via email: mp+125499@code.qastaging.launchpad.net |
Commit message
- Using a timer event that doesn't fire continuously if another update timer is in progress (LP: #1052922).
To post a comment you must log in.
This branch is wrong: it keeps using cpu while syncdaemon is idle.