From 08f457799cd36349a4fd22642f4c05b4eabb306d Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Wed, 15 Apr 2015 22:51:39 -0400
Subject: Plumb the subscription policy through the REST API.

---
 TODO.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'TODO.rst')

diff --git a/TODO.rst b/TODO.rst
index 362499258..131c52faf 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -1,5 +1,5 @@
 * TO DO:
- - plumb subscription policy through rest api
+ - rename ISubscriptionService to IMemberSearch or somesuch
  - get rid of hold_subscription
  - subsume handle_subscription
  - workflow for unsubscription
-- 
cgit v1.2.3-70-g09d2


From f5a4133b693a892826ed4156d52d41270c2fc828 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Thu, 16 Apr 2015 08:20:19 -0400
Subject: Update versions for 3.0rc1, but don't tag yet.

---
 TODO.rst                  | 1 -
 src/mailman/docs/NEWS.rst | 4 ++--
 src/mailman/version.py    | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'TODO.rst')

diff --git a/TODO.rst b/TODO.rst
index 131c52faf..0c1bfa969 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -5,7 +5,6 @@
  - workflow for unsubscription
  - make sure registration checks IEmailValidator
  - Test all the various options in eml_membership's get_subscriber()
- - Bump version to 3.0.0
  - Admin notification on membership changes?
    + admin_notify_mchanges
    + admin_immed_notify
diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst
index ebe90a6df..6248d0d57 100644
--- a/src/mailman/docs/NEWS.rst
+++ b/src/mailman/docs/NEWS.rst
@@ -8,8 +8,8 @@ Copyright (C) 1998-2015 by the Free Software Foundation, Inc.
 Here is a history of user visible changes to Mailman.
 
 
-3.0 beta 6 -- "Show Don't Tell"
-===============================
+3.0 rc 1 -- "Show Don't Tell"
+=============================
 (2015-XX-XX)
 
 Architecture
diff --git a/src/mailman/version.py b/src/mailman/version.py
index 42089aff5..4904454ad 100644
--- a/src/mailman/version.py
+++ b/src/mailman/version.py
@@ -18,7 +18,7 @@
 """Mailman version strings."""
 
 # Mailman version.
-VERSION = '3.0.0b6'
+VERSION = '3.0.0rc1'
 CODENAME = "Show Don't Tell"
 
 # And as a hex number in the manner of PY_VERSION_HEX.
@@ -32,9 +32,9 @@ FINAL = 0xf
 MAJOR_REV = 3
 MINOR_REV = 0
 MICRO_REV = 0
-REL_LEVEL = BETA
+REL_LEVEL = RC
 # At most 15 beta releases!
-REL_SERIAL = 6
+REL_SERIAL = 1
 
 HEX_VERSION = ((MAJOR_REV << 24) | (MINOR_REV << 16) | (MICRO_REV << 8) |
                (REL_LEVEL << 4)  | (REL_SERIAL << 0))
-- 
cgit v1.2.3-70-g09d2


From 2026c90c4165cf2f63fb9540c318b8e62fd283df Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Fri, 17 Apr 2015 19:18:41 -0400
Subject: Remove todo from release branch.

---
 TODO.rst | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 TODO.rst

(limited to 'TODO.rst')

diff --git a/TODO.rst b/TODO.rst
deleted file mode 100644
index 0c1bfa969..000000000
--- a/TODO.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-* TO DO:
- - rename ISubscriptionService to IMemberSearch or somesuch
- - get rid of hold_subscription
- - subsume handle_subscription
- - workflow for unsubscription
- - make sure registration checks IEmailValidator
- - Test all the various options in eml_membership's get_subscriber()
- - Admin notification on membership changes?
-   + admin_notify_mchanges
-   + admin_immed_notify
-- 
cgit v1.2.3-70-g09d2