summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-09-26 10:20:31 -0300
committerTomás Touceda <chiiph@leap.se>2014-09-26 10:20:31 -0300
commit78e8f04076c4f915b8fbdad037a863487580da5a (patch)
treeea78d499b35991a7e1e51ebbb8aee6fea6286ff1
parentfe8caf9507a5749e26712382c0a95aaa5f644ad3 (diff)
Fold in changes
-rw-r--r--CHANGELOG10
-rw-r--r--changes/feature_bounce_problematic_mails4
-rw-r--r--changes/feature_error_decrypting_key2
-rw-r--r--changes/user_id_wont_break_mx2
4 files changed, 10 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7afe32a..87f6ef1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+0.6.0 Sept 26, 2014:
+ o Bounce mails when there's a problematic situation for an email,
+ such as no public key. Fixes #4803.
+ o Properly log tracebacks for exceptions occuring in the mail
+ processing loop.
+ o Add errdecr key defaulting to each mail Soledad Document. Closes
+ #6072.
+ o Any inconsistent user would make the mx stop decrypting mails for
+ all subsequent users.
+
0.5.0 Apr 4, 2014:
o Use CouchDocument to comply with new Soledad couch backend. Fixes
#4475.
diff --git a/changes/feature_bounce_problematic_mails b/changes/feature_bounce_problematic_mails
deleted file mode 100644
index 39f059a..0000000
--- a/changes/feature_bounce_problematic_mails
+++ /dev/null
@@ -1,4 +0,0 @@
- o Bounce mails when there's a problematic situation for an email,
- such as no public key. Fixes #4803.
- o Properly log tracebacks for exceptions occuring in the mail
- processing loop. \ No newline at end of file
diff --git a/changes/feature_error_decrypting_key b/changes/feature_error_decrypting_key
deleted file mode 100644
index f0098a2..0000000
--- a/changes/feature_error_decrypting_key
+++ /dev/null
@@ -1,2 +0,0 @@
- o Add errdecr key defaulting to each mail Soledad Document. Closes
- #6072. \ No newline at end of file
diff --git a/changes/user_id_wont_break_mx b/changes/user_id_wont_break_mx
deleted file mode 100644
index 0631118..0000000
--- a/changes/user_id_wont_break_mx
+++ /dev/null
@@ -1,2 +0,0 @@
- o Any inconsistent user would make the mx stop decrypting mails for all
- subsequent users