summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-21 11:02:39 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-21 11:02:39 -0300
commitd2f161e3efda601bccfc390392302f665f8a644b (patch)
tree3ace11d4b4276c86856f3e9b96080410f366ca9b /server
parentc17fe773748e6d07941016f608c6e7cfea0b043c (diff)
parent69fd3a11a3821468e737b8fb0e3e77abef0a4b8a (diff)
Merge remote-tracking branch 'drebs/bug/4095_add-unicode-conversion-to-put_doc' into develop
Diffstat (limited to 'server')
-rw-r--r--server/changes/bug_4566_remove-creation-of-shared-db-from-soledad-server-code1
-rw-r--r--server/src/leap/soledad/server/__init__.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/server/changes/bug_4566_remove-creation-of-shared-db-from-soledad-server-code b/server/changes/bug_4566_remove-creation-of-shared-db-from-soledad-server-code
new file mode 100644
index 00000000..9e9a1b98
--- /dev/null
+++ b/server/changes/bug_4566_remove-creation-of-shared-db-from-soledad-server-code
@@ -0,0 +1 @@
+ o Remove creation of shared db from soledad server code. Closes #4566.
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py
index c80b4c68..da806ad9 100644
--- a/server/src/leap/soledad/server/__init__.py
+++ b/server/src/leap/soledad/server/__init__.py
@@ -149,8 +149,6 @@ class SoledadApp(http_app.HTTPApp):
@return: HTTP application results.
@rtype: list
"""
- # ensure the shared database exists
- self.state.ensure_database(self.SHARED_DB_NAME)
return http_app.HTTPApp.__call__(self, environ, start_response)