diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-22 15:26:51 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-22 15:26:51 -0400 |
| commit | 6d1fb5598bd02cca04ece655c07fd04c73de0dab (patch) | |
| tree | 24d8b2229d29997646258b185d561358a99b9c76 /pkg | |
| parent | 5af01e320574910bbcb0992229d47ffb49548666 (diff) | |
| parent | a7d081a7ab1c5a280cfc3bc90cda9d3e5710480f (diff) | |
Merge remote-tracking branch 'origin/develop' into debian
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/leap_mx.tac | 2 | ||||
| -rw-r--r-- | pkg/requirements.pip | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/pkg/leap_mx.tac b/pkg/leap_mx.tac index cdebba7..c101de9 100644 --- a/pkg/leap_mx.tac +++ b/pkg/leap_mx.tac @@ -51,7 +51,7 @@ check_recipient_port = config.getint("check recipient", "port") cdb = couchdbhelper.ConnectedCouchDB(server, port=port, - dbName="users", + dbName="identities", username=user, password=password) diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 7ec489d..ea59aaa 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -2,13 +2,5 @@ Twisted>=12.0.2 paisley>=0.3.1 ## XXX change me to whatever you name the package in pypi python-gnupg>=0.3.0 -leap.soledad -leap.soledad_server +leap.soledad.common>=0.3.0 leap.keymanager>=0.2.0 - -############### -# Development # -############### - -#leap.soledad # make this a dep as soon as it is installable from pypi !! --e git://github.com/andrejb/soledad.git@develop#egg=leap.soledad |