Merge lp:~wgrant/launchpad/remove-archivepublisher-config into lp:launchpad

Proposed by William Grant
Status: Merged
Merged at revision: 12778
Proposed branch: lp:~wgrant/launchpad/remove-archivepublisher-config
Merge into: lp:launchpad
Diff against target: 16 lines (+0/-6)
1 file modified
lib/canonical/config/schema-lazr.conf (+0/-6)
To merge this branch: bzr merge lp:~wgrant/launchpad/remove-archivepublisher-config
Reviewer Review Type Date Requested Status
Steve Kowalik (community) code Approve
Review via email: mp+56873@code.launchpad.net

Commit message

[r=stevenk][bug=739992][no-qa] Re-remove obsolete config keys restored in db-devel r10334.

Description of the change

archivepublisher.{root,base_url,copy_base_url} have been moved into the DB, and were removed from the production configs yesterday. This branch removes them from the config schema.

To post a comment you must log in.
Revision history for this message
Steve Kowalik (stevenk) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/config/schema-lazr.conf'
2--- lib/canonical/config/schema-lazr.conf 2011-03-23 18:29:09 +0000
3+++ lib/canonical/config/schema-lazr.conf 2011-04-08 04:30:55 +0000
4@@ -24,12 +24,6 @@
5 # datatype: string
6 dbuser: archivepublisher
7
8-# XXX: wgrant 2011-03-22 bug=739992: These three keys are obsolete and
9-# should be removed after 11.04 is released.
10-root: none
11-base_url: none
12-copy_base_url: none
13-
14
15 [binaryfile_expire]
16 dbuser: binaryfile-expire