summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-05 16:07:01 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-05 16:07:01 -0300
commitf3e0108440b36a3fb0c0f66b90881e8013f05b80 (patch)
tree93474b9494d14a97d05a11cbd04c81d13513b5f6
parent820939f3ec4d49c45234a7c5eb6d4ab2cbe5c3ee (diff)
parentf8bba9c2c2031941955340d48636bf769e99d146 (diff)
Merge remote-tracking branch 'refs/remotes/drebs/revert-couch-u1db-doc-id-encoding' into develop
-rw-r--r--common/changes/bug_4658_encode-u1db-metadata-doc-prefix1
-rw-r--r--common/src/leap/soledad/common/objectstore.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/common/changes/bug_4658_encode-u1db-metadata-doc-prefix b/common/changes/bug_4658_encode-u1db-metadata-doc-prefix
deleted file mode 100644
index 17013f6b..00000000
--- a/common/changes/bug_4658_encode-u1db-metadata-doc-prefix
+++ /dev/null
@@ -1 +0,0 @@
- o Encode U1DB metadata doc prefix. Closes #4658.
diff --git a/common/src/leap/soledad/common/objectstore.py b/common/src/leap/soledad/common/objectstore.py
index 9f477a8d..7aff3e32 100644
--- a/common/src/leap/soledad/common/objectstore.py
+++ b/common/src/leap/soledad/common/objectstore.py
@@ -50,7 +50,7 @@ class ObjectStoreDatabase(InMemoryDatabase):
A backend for storing u1db data in an object store.
"""
- U1DB_DATA_DOC_ID_PREFIX = 'u1db%2F'
+ U1DB_DATA_DOC_ID_PREFIX = 'u1db/'
@classmethod
def open_database(cls, url, create, document_factory=None):