Merge lp://qastaging/~renatofilho/sync-monitor/start-after-unity8 into lp://qastaging/sync-monitor

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Bill Filler
Approved revision: 47
Merged at revision: 39
Proposed branch: lp://qastaging/~renatofilho/sync-monitor/start-after-unity8
Merge into: lp://qastaging/sync-monitor
Prerequisite: lp://qastaging/~renatofilho/sync-monitor/check-network
Diff against target: 354 lines (+84/-66)
14 files modified
CMakeLists.txt (+1/-2)
Ubuntu/SyncMonitor/syncmonitor-qml.cpp (+2/-0)
data/CMakeLists.txt (+0/-8)
data/com.canonical.SyncMonitor.service.in (+0/-3)
debian/sync-monitor.install (+0/-1)
src/eds-helper.cpp (+40/-31)
src/eds-helper.h (+1/-0)
src/sync-daemon.cpp (+14/-3)
src/sync-daemon.h (+2/-0)
src/sync-dbus.cpp (+14/-1)
src/sync-dbus.h (+7/-0)
tests/unittest/eds-helper-mock.h (+3/-1)
upstart/CMakeLists.txt (+0/-7)
upstart/sync-monitor.conf.in (+0/-9)
To merge this branch: bzr merge lp://qastaging/~renatofilho/sync-monitor/start-after-unity8
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+240278@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-10-22.

Commit message

Do not sync on startup, only after a client registers with sync-monitor (apps, or online accounts).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
47. By Renato Araujo Oliveira Filho

Merged parent branch.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

tested according to "Test Network" section of test plan. All working.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches