summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBarry Warsaw2015-05-01 21:40:04 -0400
committerBarry Warsaw2015-05-01 21:40:04 -0400
commitcef87bc536ed9ccb6a1bcb11c784b8d09f73a7a8 (patch)
treedf3a0f850c7937c5296c5b4b95f2d7d1c853f3f8 /src
parent92834dae7aeff3d287dcbe20fd612a86c81cb411 (diff)
downloadmailman-cef87bc536ed9ccb6a1bcb11c784b8d09f73a7a8.tar.gz
mailman-cef87bc536ed9ccb6a1bcb11c784b8d09f73a7a8.tar.zst
mailman-cef87bc536ed9ccb6a1bcb11c784b8d09f73a7a8.zip
Diffstat (limited to 'src')
-rw-r--r--src/mailman/docs/NEWS.rst3
-rw-r--r--src/mailman/rest/docs/basic.rst2
-rw-r--r--src/mailman/runners/docs/rest.rst2
-rw-r--r--src/mailman/version.py10
4 files changed, 10 insertions, 7 deletions
diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst
index 714f7e0e8..a3ee0b52b 100644
--- a/src/mailman/docs/NEWS.rst
+++ b/src/mailman/docs/NEWS.rst
@@ -8,6 +8,9 @@ Copyright (C) 1998-2015 by the Free Software Foundation, Inc.
Here is a history of user visible changes to Mailman.
+3.1.0 -- "Between The Wheels"
+=============================
+
3.0.0 -- "Show Don't Tell"
==========================
(2015-04-28)
diff --git a/src/mailman/rest/docs/basic.rst b/src/mailman/rest/docs/basic.rst
index 7e013f598..5efa2526d 100644
--- a/src/mailman/rest/docs/basic.rst
+++ b/src/mailman/rest/docs/basic.rst
@@ -43,7 +43,7 @@ JSON encoded response.
>>> dump_json('http://localhost:9001/3.0/system/versions')
http_etag: "..."
- mailman_version: GNU Mailman 3.0... (...)
+ mailman_version: GNU Mailman 3...
python_version: ...
self_link: http://localhost:9001/3.0/system/versions
diff --git a/src/mailman/runners/docs/rest.rst b/src/mailman/runners/docs/rest.rst
index 71a059ae1..966c9da80 100644
--- a/src/mailman/runners/docs/rest.rst
+++ b/src/mailman/runners/docs/rest.rst
@@ -12,7 +12,7 @@ The RESTful server can be used to access basic version information.
>>> dump_json('http://localhost:9001/3.0/system')
http_etag: "..."
- mailman_version: GNU Mailman 3.0... (...)
+ mailman_version: GNU Mailman 3...
python_version: ...
self_link: http://localhost:9001/3.0/system/versions
diff --git a/src/mailman/version.py b/src/mailman/version.py
index f11701242..1986069b1 100644
--- a/src/mailman/version.py
+++ b/src/mailman/version.py
@@ -18,8 +18,8 @@
"""Mailman version strings."""
# Mailman version.
-VERSION = '3.0.0'
-CODENAME = "Show Don't Tell"
+VERSION = '3.1.0'
+CODENAME = 'Between The Wheels'
# And as a hex number in the manner of PY_VERSION_HEX.
ALPHA = 0xa
@@ -30,11 +30,11 @@ RC = GAMMA
FINAL = 0xf
MAJOR_REV = 3
-MINOR_REV = 0
+MINOR_REV = 1
MICRO_REV = 0
-REL_LEVEL = FINAL
+REL_LEVEL = ALPHA
# At most 15 beta releases!
-REL_SERIAL = 0
+REL_SERIAL = 1
HEX_VERSION = ((MAJOR_REV << 24) | (MINOR_REV << 16) | (MICRO_REV << 8) |
(REL_LEVEL << 4) | (REL_SERIAL << 0))