Merge lp:~edwin-grubbs/launchpad/remove-redundant-initialisedistroseries-section into lp:launchpad

Proposed by Edwin Grubbs
Status: Merged
Approved by: Curtis Hovey
Approved revision: no longer in the source branch.
Merged at revision: 11717
Proposed branch: lp:~edwin-grubbs/launchpad/remove-redundant-initialisedistroseries-section
Merge into: lp:launchpad
Diff against target: 17 lines (+0/-10)
1 file modified
lib/canonical/config/schema-lazr.conf (+0/-10)
To merge this branch: bzr merge lp:~edwin-grubbs/launchpad/remove-redundant-initialisedistroseries-section
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+38571@code.launchpad.net

Description of the change

Remove previous fix for config, which just happens to conflict someone else's fix that was sitting in pqm.

My previous fix.
https://code.edge.launchpad.net/~edwin-grubbs/launchpad/add-initialisedistroseries-section/+merge/38546

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thanks for following this up.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf 2010-10-15 16:52:24 +0000
+++ lib/canonical/config/schema-lazr.conf 2010-10-15 17:10:04 +0000
@@ -2069,13 +2069,3 @@
2069module: lp.registry.interfaces.persontransferjob2069module: lp.registry.interfaces.persontransferjob
2070dbuser: person-transfer-job2070dbuser: person-transfer-job
2071crontab_group: MAIN2071crontab_group: MAIN
2072
2073[initialisedistroseries]
2074# A prefix for "OOPS" codes for this process instance.
2075# # This is used to allow storing the reports from different
2076# # Launchpad instances in the same directory structure.
2077# # datatype: string
2078oops_prefix: IDSJ
2079# Directory to write error reports to.
2080# # datatype: string
2081error_dir: none