lp:~vds/desktopcouch/desktopcouch_couchdb_0_7
- Get this branch:
- bzr branch lp:~vds/desktopcouch/desktopcouch_couchdb_0_7
Branch merges
- Chad Miller (community): Approve
- Eric Casteleijn (community): Approve
-
Diff: 996 lines (+462/-178)10 files modifieddesktopcouch/contacts/testing/create.py (+1/-1)
desktopcouch/contacts/tests/test_view.py (+80/-28)
desktopcouch/local_files.py (+29/-14)
desktopcouch/pair/tests/test_couchdb_io.py (+40/-16)
desktopcouch/records/server.py (+23/-14)
desktopcouch/records/server_base.py (+267/-91)
desktopcouch/records/tests/test_server.py (+3/-2)
desktopcouch/replication_services/ubuntuone.py (+10/-6)
desktopcouch/tests/__init__.py (+7/-5)
desktopcouch/tests/test_replication.py (+2/-1)
Branch information
Recent revisions
- 159. By Chad Miller
-
Don't crash when we're trying to stop announcing on DBus and the DBus server won't talk to us. It's not a big error, since it probably won't talk to anyone else either. (LP: #563738, #464071)
- 158. By Chad Miller
-
Try to avoid a bug I can not reproduce, which may be related to suspend in some way. On a socket error when trying to talk to couchdb, reconnect, which may spawn a new couchdb if one is not running (for reasons that are unknown to Chad). (LP: #522538)
- 157. By Chad Miller
-
A possible fix for a bug I can't reproduce, Bug#465216. It is possible that two calls to find_port will happen near the same time. The steps tostarting up couchdb are 1) start couchdb if not already running, 2) get pid, 3) get port. Two processes can be in that chain at the same time, and only one will win the race of having started the winning couchdb. In that case, each should be willing to restart the entire chain over.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:desktopcouch