← Back to branch summary

~cmiller/desktopcouch/proxy-for-consistent-port

~cmiller/desktopcouch/proxy-for-consistent-port

Viewing all changes in revision 205.

Committer: Chad Miller
Date: 2010-11-16 16:52:20 UTC
mfrom: (199.2.10 desktopcouch)
Revision ID: chad.miller@canonical.com-20101116165220-9x141o0vkr7cg2s7

https://launchpad.net/bugs/670054

Update microproxy branch with merge from trunk.

files added:
.bzrignore

files modified:
bin/desktopcouch-pair

data/source_desktopcouch.py

desktopcouch/contacts/tests/test_record.py

desktopcouch/contacts/tests/test_view.py

desktopcouch/contacts/view.py

desktopcouch/local_files.py

desktopcouch/pair/couchdb_pairing/couchdb_io.py

desktopcouch/pair/couchdb_pairing/ubuntuone_pairing.py

desktopcouch/pair/tests/test_couchdb_io.py

desktopcouch/pair/tests/test_ubuntuone_pairing.py

desktopcouch/platform/__init__.py

desktopcouch/platform/linux/couchdb_proxy.py

desktopcouch/platform/linux/ipc.py

desktopcouch/platform/linux/keyring.py

desktopcouch/records/doc/an_example_application.txt

desktopcouch/records/doc/field_registry.txt

desktopcouch/records/doc/records.txt

desktopcouch/records/field_registry.py

desktopcouch/records/record.py

desktopcouch/records/server.py

desktopcouch/records/server_base.py

desktopcouch/records/tests/test_field_registry.py

desktopcouch/records/tests/test_record.py

desktopcouch/records/tests/test_server.py

desktopcouch/service.py

desktopcouch/start_local_couchdb.py

desktopcouch/tests/test_service.py

desktopcouch/tests/test_start_local_couchdb.py

po/desktopcouch.pot

runtests.py

utilities/lint.sh

Show diffs side-by-side

added added

removed removed

bin/desktopcouch-pair

data/source_desktopcouch.py

desktopcouch/contacts/tests/test_record.py

desktopcouch/contacts/tests/test_view.py

desktopcouch/contacts/view.py

desktopcouch/local_files.py

desktopcouch/pair/couchdb_pairing/couchdb_io.py

desktopcouch/pair/couchdb_pairing/ubuntuone_pairing.py

desktopcouch/pair/tests/test_couchdb_io.py

desktopcouch/pair/tests/test_ubuntuone_pairing.py

desktopcouch/platform/__init__.py

desktopcouch/platform/linux/couchdb_proxy.py

desktopcouch/platform/linux/ipc.py

desktopcouch/platform/linux/keyring.py

desktopcouch/records/doc/an_example_application.txt

desktopcouch/records/doc/field_registry.txt

desktopcouch/records/doc/records.txt

desktopcouch/records/field_registry.py

desktopcouch/records/record.py

desktopcouch/records/server.py

desktopcouch/records/server_base.py

desktopcouch/records/tests/test_field_registry.py

desktopcouch/records/tests/test_record.py

desktopcouch/records/tests/test_server.py

desktopcouch/service.py

desktopcouch/start_local_couchdb.py

desktopcouch/tests/test_service.py

desktopcouch/tests/test_start_local_couchdb.py

po/desktopcouch.pot

utilities/lint.sh

Older »