diff options
| author | drebs <drebs@leap.se> | 2015-06-04 11:15:28 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2015-06-04 11:15:28 -0300 |
| commit | b73d45aad428a530917a0f7b2e6e75645376eacc (patch) | |
| tree | 15f0fb29c236fee5ca5ee65fd546d0c08606913d /common | |
| parent | 289fab7dbeace040cdd6752026870e4d72e8265f (diff) | |
| parent | 9fb1c47ca7da06d6feef6846b812aec28128ed78 (diff) | |
Merge tag '0.7.0' into develop
Tag version 0.7.0.
Conflicts:
client/pkg/requirements.pip
common/pkg/requirements.pip
Diffstat (limited to 'common')
5 files changed, 3 insertions, 6 deletions
diff --git a/common/changes/bug_5896_include-ddocs-source-in-sdist b/common/changes/bug_5896_include-ddocs-source-in-sdist deleted file mode 100644 index 94188f5e..00000000 --- a/common/changes/bug_5896_include-ddocs-source-in-sdist +++ /dev/null @@ -1,2 +0,0 @@ - o Include couch design docs source files in source distribution and only - compile ddocs.py when building the package (#5896). diff --git a/common/changes/bug_6671-bail-out-if-no-cdocs-dir b/common/changes/bug_6671-bail-out-if-no-cdocs-dir deleted file mode 100644 index e57e50e5..00000000 --- a/common/changes/bug_6671-bail-out-if-no-cdocs-dir +++ /dev/null @@ -1 +0,0 @@ -o Bail out if cdocs/ dir does not exist. Closes: #6671 diff --git a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state deleted file mode 100644 index 2c927717..00000000 --- a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state +++ /dev/null @@ -1,2 +0,0 @@ - o Remove unneeded parameters from CouchServerState initialization. Closes - #6833. diff --git a/common/changes/feature_adapt-to-new-events-on-common b/common/changes/feature_adapt-to-new-events-on-common deleted file mode 100644 index cd55fa7d..00000000 --- a/common/changes/feature_adapt-to-new-events-on-common +++ /dev/null @@ -1 +0,0 @@ -- Adapt soledad to the new events api on leap.common. Related to #6359. diff --git a/common/pkg/requirements.pip b/common/pkg/requirements.pip index 287741d2..005d6884 100644 --- a/common/pkg/requirements.pip +++ b/common/pkg/requirements.pip @@ -1,6 +1,9 @@ simplejson u1db +# leap deps -- bump me! +leap.common>=0.7.0 + # XXX -- fix me! # oauth is not strictly needed by us, but we need it until u1db adds it to its # release as a dep. |