Merge lp://qastaging/~renatofilho/sync-monitor/no-contacts-sync into lp://qastaging/sync-monitor
Proposed by
Renato Araujo Oliveira Filho
Status: | Merged |
---|---|
Approved by: | Michael Sheldon |
Approved revision: | 56 |
Merged at revision: | 50 |
Proposed branch: | lp://qastaging/~renatofilho/sync-monitor/no-contacts-sync |
Merge into: | lp://qastaging/sync-monitor |
Diff against target: |
452 lines (+93/-165) 15 files modified
CMakeLists.txt (+1/-0) accounts/CMakeLists.txt (+0/-1) accounts/applications/CMakeLists.txt (+0/-14) accounts/applications/contacts-sync.application.in (+0/-12) accounts/desktop/CMakeLists.txt (+0/-2) accounts/desktop/sync-monitor-contacts.desktop.in (+0/-9) accounts/services/CMakeLists.txt (+0/-6) accounts/services/google-carddav.service.in (+0/-24) accounts/services/yahoo-caldav.service.in (+0/-15) accounts/services/yahoo-carddav.service.in (+0/-15) debian/sync-monitor-uoa.install (+0/-5) src/eds-helper.cpp (+90/-34) src/sync-daemon.cpp (+2/-20) src/sync-daemon.h (+0/-1) templates/google.conf (+0/-7) |
To merge this branch: | bzr merge lp://qastaging/~renatofilho/sync-monitor/no-contacts-sync |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Sheldon (community) | Approve | ||
Ken VanDine | Approve | ||
Review via email:
|
Commit message
Do not sync contacts.
Contacts sync will be handled by buteo.
To post a comment you must log in.
Are there any related MPs required for this MP to build/function as expected?
NO
Is your branch in sync with latest trunk?
YES
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
YES
Did you successfully run all tests found in your component's Test Plan on device or emulator?
YES
If you changed the UI, was the change specified/approved by design?
NO UI CHANGED
If you changed UI labels, did you update the pot file?
NO LABEL CHANGED
If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
YES