6 files changed, 8 insertions, 6 deletions

diff --git a/src/mailman/database/schema/mm_20121015000000.py b/src/mailman/database/schema/mm_20121015000000.py
index dd6d23ca7..7745b8d9b 100644
--- a/src/mailman/database/schema/mm_20121015000000.py
+++ b/src/mailman/database/schema/mm_20121015000000.py
@@ -96,6 +96,7 @@ def upgrade_postgres(database, store, version, module_path):
     store.execute('ALTER TABLE mailinglist DROP COLUMN send_reminders;')
     store.execute('ALTER TABLE mailinglist DROP COLUMN subscribe_policy;')
     store.execute('ALTER TABLE mailinglist DROP COLUMN unsubscribe_policy;')
+    store.execute('ALTER TABLE mailinglist DROP COLUMN private_roster;')
     store.execute(
         'ALTER TABLE mailinglist DROP COLUMN subscribe_auto_approval;')
     # Record the migration in the version table.
diff --git a/src/mailman/database/schema/sqlite_20121015000000_01.sql b/src/mailman/database/schema/sqlite_20121015000000_01.sql
index 73a56230b..0526f9c8e 100644
--- a/src/mailman/database/schema/sqlite_20121015000000_01.sql
+++ b/src/mailman/database/schema/sqlite_20121015000000_01.sql
@@ -24,6 +24,10 @@ ALTER TABLE ban_backup ADD COLUMN list_id TEXT;
 -- REMOVALS from the mailinglist table.
 -- REM new_member_options
 -- REM send_reminders
+-- REM subscribe_policy
+-- REM unsubscribe_policy
+-- REM subscribe_auto_approval
+-- REM private_roster
 
 CREATE TABLE ml_backup (
     id INTEGER NOT NULL,
@@ -105,7 +109,6 @@ CREATE TABLE ml_backup (
     posting_chain TEXT,
     posting_pipeline TEXT,
     preferred_language TEXT,
-    private_roster BOOLEAN,
     display_name TEXT,
     reject_these_nonmembers BLOB,
     reply_goes_to_list INTEGER,
@@ -207,7 +210,6 @@ INSERT INTO ml_backup SELECT
     posting_chain,
     posting_pipeline,
     preferred_language,
-    private_roster,
     display_name,
     reject_these_nonmembers,
     reply_goes_to_list,
diff --git a/src/mailman/database/tests/test_migrations.py b/src/mailman/database/tests/test_migrations.py
index 5b800caf7..16a536894 100644
--- a/src/mailman/database/tests/test_migrations.py
+++ b/src/mailman/database/tests/test_migrations.py
@@ -380,7 +380,7 @@ class TestMigration20121015Schema(MigrationTestBase):
                               (),
                               ('new_member_options', 'send_reminders',
                                'subscribe_policy', 'unsubscribe_policy',
-                               'subscribe_auto_approval'),
+                               'subscribe_auto_approval', 'private_roster'),
                               )
 
     def test_post_upgrade_column_migrations(self):
@@ -394,7 +394,7 @@ class TestMigration20121015Schema(MigrationTestBase):
                                '20121015000000'],
                               ('new_member_options', 'send_reminders',
                                'subscribe_policy', 'unsubscribe_policy',
-                               'subscribe_auto_approval'),
+                               'subscribe_auto_approval', 'private_roster'),
                               ())
 
 
diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst
index 99e4deb41..8acf68043 100644
--- a/src/mailman/docs/NEWS.rst
+++ b/src/mailman/docs/NEWS.rst
@@ -80,6 +80,7 @@ Database
    - `mailinglist.subscribe_policy`
    - `mailinglist.unsubscribe_policy`
    - `mailinglist.subscribe_auto_approval`
+   - `mailinglist.private_roster`
 
 Interfaces
 ----------
diff --git a/src/mailman/model/mailinglist.py b/src/mailman/model/mailinglist.py
index b3f0d28cc..28c911619 100644
--- a/src/mailman/model/mailinglist.py
+++ b/src/mailman/model/mailinglist.py
@@ -174,7 +174,6 @@ class MailingList(Model):
     posting_chain = Unicode()
     posting_pipeline = Unicode()
     _preferred_language = Unicode(name='preferred_language')
-    private_roster = Bool()
     display_name = Unicode()
     reject_these_nonmembers = Pickle()
     reply_goes_to_list = Enum(ReplyToMunging)
diff --git a/src/mailman/styles/default.py b/src/mailman/styles/default.py
index da081f6b0..9f0e3858c 100644
--- a/src/mailman/styles/default.py
+++ b/src/mailman/styles/default.py
@@ -84,7 +84,6 @@ from: .*@uplinkpro.com
         mlist.info = ''
         mlist.welcome_message_uri = 'mailman:///welcome.txt'
         mlist.goodbye_message_uri = ''
-        mlist.private_roster = 1
         mlist.obscure_addresses = True
         mlist.admin_member_chunksize = 30
         mlist.administrivia = True