Merge lp://qastaging/~cmiller/ubuntu/oneiric/desktopcouch/1.0.8-0u1 into lp://qastaging/ubuntu/oneiric/desktopcouch
Proposed by
Chad Miller
| Status: | Merged |
|---|---|
| Merged at revision: | 47 |
| Proposed branch: | lp://qastaging/~cmiller/ubuntu/oneiric/desktopcouch/1.0.8-0u1 |
| Merge into: | lp://qastaging/ubuntu/oneiric/desktopcouch |
| Diff against target: |
1660 lines (+521/-554) 29 files modified
MANIFEST (+126/-0) PKG-INFO (+21/-2) config/desktop-couch/default.ini (+3/-0) data/epydoc.conf (+25/-0) debian/changelog (+21/-0) debian/control (+2/-2) debian/patches/5-defer-dbus-service-for-plugins.patch (+0/-249) debian/python-desktopcouch-application.install (+6/-2) debian/python-desktopcouch-recordtypes.install (+4/-1) debian/rules (+0/-1) desktopcouch.egg-info/PKG-INFO (+0/-10) desktopcouch.egg-info/SOURCES.txt (+0/-126) desktopcouch.egg-info/dependency_links.txt (+0/-1) desktopcouch.egg-info/top_level.txt (+0/-1) desktopcouch/application/local_files.py (+5/-2) desktopcouch/application/platform/linux/tests/test_keyring.py (+1/-1) desktopcouch/application/platform/windows/tests/test_base_dirs.py (+2/-2) desktopcouch/application/plugins/__init__.py (+13/-3) desktopcouch/application/plugins/tests/test_plugins.py (+3/-1) desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py (+36/-8) desktopcouch/application/plugins/ubuntuone_pairing.py (+75/-44) desktopcouch/application/replication.py (+1/-1) desktopcouch/application/service.py (+51/-11) desktopcouch/application/start_local_couchdb.py (+1/-1) desktopcouch/application/tests/test_service.py (+96/-62) desktopcouch/records/tests/test_mocked_server.py (+4/-3) desktopcouch/recordtypes/contacts/tests/test_view.py (+8/-8) setup.cfg (+4/-4) setup.py (+13/-8) |
| To merge this branch: | bzr merge lp://qastaging/~cmiller/ubuntu/oneiric/desktopcouch/1.0.8-0u1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
New version:
Behavior change: Preserves Ubuntu One service through longer replication period, 10 minutes changed to 60 minutes.
Feature: Allow COUCH_INI environment variable to override /etc/ default config.
Feature: Install apport hook.
Bug fix: When ubuntuone credentials don't exist, don't wait forever and consume CPU.
Bug fix: Accept "linux3" kernel also.
Bug fix: Clean up all children when service exits.
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
