summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-15 10:09:04 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-15 10:09:04 -0300
commit70aa832393c1e926512ff8f333ef6170aa11dab7 (patch)
tree83af195334ff3cb0d25d65a76e4b8ecc782bd6b3
parent930b7cd7e56440b638bd646b288f33063e15f3d0 (diff)
Fold in changes
-rw-r--r--CHANGELOG6
-rw-r--r--client/changes/bug_4417_default-encoding-to-utf81
-rw-r--r--client/changes/bug_open-db-in-autocommit-mode2
3 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e82801a1..660d4160 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+0.4.3 Nov 15:
+ o Defaults detected encoding to utf-8 to avoid bug if detected
+ encoding is None. Closes: #4417
+ o Open db in autocommit mode, to avoid nested transactions problems.
+ Closes: #4400
+
0.4.2 Nov 1:
Client:
o Support non-ascii passwords. Closes #4001.
diff --git a/client/changes/bug_4417_default-encoding-to-utf8 b/client/changes/bug_4417_default-encoding-to-utf8
deleted file mode 100644
index 6801b766..00000000
--- a/client/changes/bug_4417_default-encoding-to-utf8
+++ /dev/null
@@ -1 +0,0 @@
- o Defaults detected encoding to utf-8 to avoid bug if detected encoding is None. Closes: #4417
diff --git a/client/changes/bug_open-db-in-autocommit-mode b/client/changes/bug_open-db-in-autocommit-mode
deleted file mode 100644
index 26edd5a9..00000000
--- a/client/changes/bug_open-db-in-autocommit-mode
+++ /dev/null
@@ -1,2 +0,0 @@
- o Open db in autocommit mode, to avoid nested transactions problems.
- Closes: #4400