diff options
author | Kali Kaneko <kali@leap.se> | 2013-12-23 01:56:30 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-12-23 01:56:30 -0400 |
commit | 207b77f926a294132e45439df693bd473253a146 (patch) | |
tree | cc07488964795e374271dcb9fa2e68c98855b3d1 /client/changes | |
parent | 8d23b2971f27d6d549004c2d748494f367eab460 (diff) | |
parent | 19af1736a750a1a8679c21071305b97f626f1d14 (diff) |
Merge branch 'develop' into debian
Preparing for 0.5.0~rc
Conflicts:
.gitignore
client/src/leap/soledad/client/_version.py
common/src/leap/soledad/common/_version.py
server/src/leap/soledad/server/_version.py
Diffstat (limited to 'client/changes')
-rw-r--r-- | client/changes/bug_reuse-http-connection | 2 | ||||
-rw-r--r-- | client/changes/bug_unlock_shared_if_fails | 2 | ||||
-rw-r--r-- | client/changes/feature_4616_sqlite_count_by_index | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/client/changes/bug_reuse-http-connection b/client/changes/bug_reuse-http-connection new file mode 100644 index 00000000..c6cdd9b4 --- /dev/null +++ b/client/changes/bug_reuse-http-connection @@ -0,0 +1,2 @@ + o Fix a bug in soledad.client.sqlcipher by which we were creating + a new connection for each sync. diff --git a/client/changes/bug_unlock_shared_if_fails b/client/changes/bug_unlock_shared_if_fails new file mode 100644 index 00000000..fc5716e4 --- /dev/null +++ b/client/changes/bug_unlock_shared_if_fails @@ -0,0 +1,2 @@ + o Unlock shared_db if anything fails in the bootstrap + sequence. Fixes #4702.
\ No newline at end of file diff --git a/client/changes/feature_4616_sqlite_count_by_index b/client/changes/feature_4616_sqlite_count_by_index new file mode 100644 index 00000000..c7819d38 --- /dev/null +++ b/client/changes/feature_4616_sqlite_count_by_index @@ -0,0 +1 @@ + o Adds a get_count_by_index to sqlcipher u1db backend. Related to: #4616 |