aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2014-04-19 18:11:41 -0700
committerMark Sapiro <mark@msapiro.net>2014-04-19 18:11:41 -0700
commit401e2349f7f0fc82df4a65a8c58a16115f785bb4 (patch)
tree0945347c3d09b81e0fcb275952eb475ae32883cd
parent6748722f16ff61f24c11f9cb8a90bcc0072c115f (diff)
downloadmailman2-401e2349f7f0fc82df4a65a8c58a16115f785bb4.tar.gz
mailman2-401e2349f7f0fc82df4a65a8c58a16115f785bb4.tar.xz
mailman2-401e2349f7f0fc82df4a65a8c58a16115f785bb4.zip
Bumped branch version to: 2.1.18rc2
-rw-r--r--Mailman/Version.py4
-rwxr-xr-xNEWS4
2 files changed, 6 insertions, 2 deletions
diff --git a/Mailman/Version.py b/Mailman/Version.py
index 37124a9b..1c52f313 100644
--- a/Mailman/Version.py
+++ b/Mailman/Version.py
@@ -16,7 +16,7 @@
# USA.
# Mailman version
-VERSION = '2.1.18rc1'
+VERSION = '2.1.18rc2'
# And as a hex number in the manner of PY_VERSION_HEX
ALPHA = 0xa
@@ -31,7 +31,7 @@ MINOR_REV = 1
MICRO_REV = 18
REL_LEVEL = GAMMA
# at most 15 beta releases!
-REL_SERIAL = 1
+REL_SERIAL = 2
HEX_VERSION = ((MAJOR_REV << 24) | (MINOR_REV << 16) | (MICRO_REV << 8) |
(REL_LEVEL << 4) | (REL_SERIAL << 0))
diff --git a/NEWS b/NEWS
index 18e54168..65447dc7 100755
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
Here is a history of user visible changes to Mailman.
+2.1.18rc2 (19-Apr-2014)
+ - The new Utils.IsDMARCProhibited() used collections.defaultdict which
+ requires Python 2.5. Changed to use a dict and setdefault.
+
2.1.18rc1 (18-Apr-2014)
Dependencies