Merge launchpad:master into launchpad:db-devel
Proposed by
Colin Watson
| Status: | Merged |
|---|---|
| Approved by: | Colin Watson |
| Approved revision: | 7cc2b100ff6cee4a1af522ffb6bd19200b0bc011 |
| Merge reported by: | Otto Co-Pilot |
| Merged at revision: | not available |
| Proposed branch: | launchpad:master |
| Merge into: | launchpad:db-devel |
| Diff against target: |
1786 lines (+576/-268) 41 files modified
lib/lp/archivepublisher/archivegpgsigningkey.py (+55/-23) lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py (+105/-3) lib/lp/blueprints/browser/sprint.py (+3/-2) lib/lp/blueprints/browser/tests/test_views.py (+2/-1) lib/lp/blueprints/model/specification.py (+14/-13) lib/lp/blueprints/model/sprint.py (+96/-70) lib/lp/blueprints/model/sprintspecification.py (+39/-23) lib/lp/blueprints/vocabularies/sprint.py (+5/-9) lib/lp/code/mail/tests/test_codehandler.py (+2/-0) lib/lp/code/mail/tests/test_codereviewcomment.py (+1/-1) lib/lp/code/model/branchcollection.py (+2/-2) lib/lp/code/model/branchmergeproposal.py (+28/-15) lib/lp/code/model/codereviewcomment.py (+30/-14) lib/lp/code/model/codereviewvote.py (+36/-20) lib/lp/code/model/gitcollection.py (+2/-2) lib/lp/code/model/tests/test_branch.py (+4/-4) lib/lp/code/model/tests/test_gitrepository.py (+4/-4) lib/lp/code/stories/webservice/xx-branchmergeproposal.txt (+2/-2) lib/lp/codehosting/puller/tests/test_scheduler.py (+1/-1) lib/lp/registry/model/projectgroup.py (+13/-10) lib/lp/services/database/policy.py (+1/-1) lib/lp/services/gpg/handler.py (+3/-7) lib/lp/services/gpg/interfaces.py (+13/-2) lib/lp/services/librarianserver/tests/test_storage_db.py (+1/-1) lib/lp/services/mail/helpers.py (+11/-3) lib/lp/services/signing/tests/helpers.py (+2/-2) lib/lp/services/worlddata/vocabularies.py (+4/-1) lib/lp/soyuz/adapters/tests/test_archivedependencies.py (+1/-1) lib/lp/soyuz/configure.zcml (+0/-1) lib/lp/soyuz/interfaces/archive.py (+2/-0) lib/lp/soyuz/model/archive.py (+7/-6) lib/lp/soyuz/scripts/ppakeygenerator.py (+3/-3) lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py (+5/-5) lib/lp/soyuz/stories/soyuz/xx-person-packages.txt (+1/-1) lib/lp/soyuz/tests/test_archive.py (+1/-1) lib/lp/testing/factory.py (+4/-4) lib/lp/translations/pottery/tests/test_detect_intltool.py (+14/-0) scripts/rosetta/pottery-generate-intltool.py (+56/-0) utilities/launchpad-database-setup (+0/-7) utilities/sourcedeps.cache (+2/-2) utilities/sourcedeps.conf (+1/-1) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Manually merge from master to fix tests with PostgreSQL 10 base image
Description of the change
Now that buildbot is on LXD with fresh base images, db-devel can't pass tests until https:/
To post a comment you must log in.
Revision history for this message
| Colin Watson (cjwatson) | # |
review:
Approve
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
