lp:~cmiller/desktopcouch/get_port_not_stale
- Get this branch:
- bzr branch lp:~cmiller/desktopcouch/get_port_not_stale
Branch merges
- Tim Cole (community): Approve
- Eric Casteleijn (community): Approve
- Stuart Langridge (community): Abstain
- Diff: None lines
Branch information
Recent revisions
- 51. By Chad Miller
-
Revert the log-file reading code to the reliable (if somewhat oblique,
nonportable, and downright ugly) /proc reading code. Log files can be stale.Change the startup code to be smarter about discovering and passing around pids
and ports, and more insistent about making sure a program is started before we
resume doing stuff that requires it to be running. This should solve races and
double execution of couchdb.Change the regex that scans /proc networking stuff so that it doesn't balk at
non-127.0.0.1 addresses.TODO: Also get the PID out of the /proc networking file, and perhaps save some
steps or make the tests far more resilient.(Note: The test suite is pretty invasive, so "killall beam.smp" as your normal
user after you run it.) - 48. By Chad Miller
-
Add local-db replication daemon, and fix a few typos.
Since couchdb auth is not yet supported, stop the pairing tool from giving the user that local replication is supported. Once couchdb is not a security risk and we can bind it to an external interface, then replication will work for everyone.
- 47. By Elliot Murphy
-
Fixes a problem with writing the bookmark file (data type needs to be str instead of int).
- 46. By Eric Casteleijn
-
This comments out two sections in the .ini file, to disable authentication, since it's not working as long as couchdb-478 is not fixed.
This has these four other branches merged in, and all conflicts removed:
lp:~thisfred/desktopcouch/any_port_in_a_storm/
lp:~sil/desktopcouch/create-oauth-tokens-startup
lp:~sil/desktopcouch/get-oauth-tokens-function
lp:~sil/desktopcouch/not-so-random - 45. By Eric Casteleijn
-
Reads the portnumber from the logfile, now that it is written there by couchdb.
- 44. By Stuart Langridge
-
Add selectable "Ubuntu One" option in pairing application if you already have the Ubuntu One OAuth keys.
- 43. By Rick Spencer
-
1. rename CouchWidget to CouchGrid - I did this because "CouchWidget" is too generic, and also we may want to create other desktopcouch pygtk widgets in the future. "CouchWidget" should be reserved for a baseclass that handles desktopcouch.
records connectivity, and the CouchGrid and other widgets can derive from it.
2. renamed CouchGrid.headings to CouchGrid.keys to better reflect the actual role of the property. "Headings" are really TreeViewColumn titles, which can be set in the CouchGrid, as it derives from TreeView.
3. Changed couchwidget tests to couchgrid tests, and updated them so that they pass after the renamings.
4. Added a test for contactspicker to test that contactspicker can be constructed after the renaming. More tests should probably be added to test_contactspicker in the future. - 42. By Elliot Murphy
-
Merging lp:~thisfred/desktopcouch/i_believe_you_have_my_couchdb.
tarmac is broken due to constant 502 bad gateway errors from
launchpad today, so I'm merging manually.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:desktopcouch