Merge lp://qastaging/~vds/desktopcouch/again_python_couchdb into lp://qastaging/desktopcouch
Proposed by
Vincenzo Di Somma
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | dobey | ||||||||
| Approved revision: | 227 | ||||||||
| Merged at revision: | 234 | ||||||||
| Proposed branch: | lp://qastaging/~vds/desktopcouch/again_python_couchdb | ||||||||
| Merge into: | lp://qastaging/desktopcouch | ||||||||
| Diff against target: |
1043 lines (+376/-222) 20 files modified
desktopcouch/application/local_files.py (+1/-1) desktopcouch/application/migration/__init__.py (+3/-1) desktopcouch/application/migration/tests/test_migration.py (+18/-1) desktopcouch/application/pair/couchdb_pairing/couchdb_io.py (+7/-15) desktopcouch/application/pair/couchdb_pairing/ubuntuone_pairing.py (+2/-8) desktopcouch/application/platform/__init__.py (+1/-0) desktopcouch/application/platform/linux/base_dirs.py (+1/-0) desktopcouch/application/server.py (+12/-19) desktopcouch/application/service.py (+2/-1) desktopcouch/bookmarks/__init__.py (+0/-1) desktopcouch/bookmarks/record.py (+0/-9) desktopcouch/notes/__init__.py (+0/-1) desktopcouch/notes/record.py (+0/-9) desktopcouch/records/database.py (+38/-129) desktopcouch/records/http.py (+266/-0) desktopcouch/records/tests/test_server.py (+19/-7) desktopcouch/recordtypes/contacts/testing/create.py (+6/-2) desktopcouch/recordtypes/contacts/view.py (+0/-8) desktopcouch/tasks/__init__.py (+0/-1) desktopcouch/tasks/record.py (+0/-9) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~vds/desktopcouch/again_python_couchdb | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller (community) | Approve | ||
| Manuel de la Peña (community) | Approve | ||
| Eric Casteleijn (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Port to use python-couchdb 0.8. This makes future desktopcouch incompatible with previous versions of python-couchdb.
Description of the change
Port to python-couchdb 0.8, to test it download it from here:
http://
Unpack and put the couchdb folder in the root of the branch.
To post a comment you must log in.
Revision history for this message
| Eric Casteleijn (thisfred) wrote | # |
Revision history for this message
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
Revision history for this message
| Chad Miller (cmiller) wrote | # |
Revision history for this message
| Eric Casteleijn (thisfred) wrote | # |
Revision history for this message
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
Revision history for this message
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
looks good to me, tests pass.