Merge launchpad:master into launchpad:db-devel
Proposed by
Colin Watson
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | 5208e7f8f75eb1d093d03c455dcca20a57934b38 |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | launchpad:master |
Merge into: | launchpad:db-devel |
Diff against target: |
171 lines (+21/-45) 6 files modified
database/sampledata/current-dev.sql (+1/-1) database/sampledata/current.sql (+1/-1) lib/lp/registry/model/codeofconduct.py (+1/-1) lib/lp/registry/tests/test_codeofconduct.py (+18/-0) lib/lp/scripts/garbo.py (+0/-25) lib/lp/scripts/tests/test_garbo.py (+0/-17) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson (community) | Approve | ||
Review via email: mp+410610@code.launchpad.net |
Commit message
Manually merge from master to remove PopulateSignedC
Description of the change
This is needed on db-devel to get the latest schema patch to pass its tests. (The garbo job has already run on production, and it's only the test that had a problem, not the job itself.)
To post a comment you must log in.