Merge launchpad:master into launchpad:db-devel
Proposed by
Ines Almeida
Status: | Merged |
---|---|
Approved by: | Simone Pelosi |
Approved revision: | b05306ed0da998336b30540a42d9826b8df69fca |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | launchpad:master |
Merge into: | launchpad:db-devel |
Diff against target: |
7443 lines (+1371/-1501) 163 files modified
.pre-commit-config.yaml (+5/-2) charm/launchpad-ppa-publisher/charmcraft.yaml (+1/-0) charm/launchpad-ppa-uploader/charmcraft.yaml (+1/-0) cronscripts/parse-librarian-apache-access-logs.py (+6/-5) database/replication/Makefile (+27/-18) database/schema/security.cfg (+3/-3) dev/null (+0/-14) doc/reference/python.rst (+1/-16) lib/lp/answers/browser/questiontarget.py (+1/-1) lib/lp/answers/interfaces/question.py (+2/-2) lib/lp/answers/interfaces/questionmessage.py (+1/-9) lib/lp/app/doc/batch-navigation.rst (+1/-2) lib/lp/app/validators/README.txt (+2/-4) lib/lp/archivepublisher/tests/test_sync_signingkeys.py (+4/-1) lib/lp/archiveuploader/tests/test_nascentupload_documentation.py (+2/-1) lib/lp/archiveuploader/uploadprocessor.py (+2/-4) lib/lp/blueprints/doc/specification.rst (+5/-4) lib/lp/blueprints/model/specificationworkitem.py (+6/-3) lib/lp/blueprints/model/sprint.py (+1/-6) lib/lp/blueprints/model/sprintattendance.py (+5/-4) lib/lp/blueprints/vocabularies/specificationdependency.py (+1/-1) lib/lp/bugs/browser/tests/buglinktarget-views.rst (+1/-1) lib/lp/bugs/model/bug.py (+2/-2) lib/lp/bugs/model/bugtask.py (+1/-1) lib/lp/bugs/model/bugtasksearch.py (+34/-38) lib/lp/bugs/stories/bugs/xx-bug-text-pages.rst (+1/-1) lib/lp/bugs/stories/webservice/xx-bug.rst (+45/-0) lib/lp/buildmaster/interfaces/processor.py (+1/-1) lib/lp/charms/model/charmrecipebuild.py (+2/-2) lib/lp/code/doc/codeimport-machine.rst (+1/-1) lib/lp/code/interfaces/branch.py (+1/-1) lib/lp/code/mail/tests/test_codehandler.py (+1/-1) lib/lp/code/model/cibuild.py (+1/-1) lib/lp/code/model/sourcepackagerecipe.py (+3/-3) lib/lp/code/model/sourcepackagerecipebuild.py (+1/-1) lib/lp/code/model/tests/test_codereviewkarma.py (+1/-1) lib/lp/code/model/tests/test_revisionauthor.py (+6/-6) lib/lp/code/xmlrpc/tests/test_git.py (+14/-25) lib/lp/codehosting/tests/test_acceptance.py (+7/-5) lib/lp/oci/model/ocirecipebuild.py (+3/-3) lib/lp/registry/browser/person.py (+5/-6) lib/lp/registry/browser/tests/test_person_webservice.py (+16/-0) lib/lp/registry/doc/person-account.rst (+5/-3) lib/lp/registry/doc/person-merge.rst (+4/-0) lib/lp/registry/doc/pillar.rst (+7/-3) lib/lp/registry/doc/vocabularies.rst (+0/-1) lib/lp/registry/interfaces/person.py (+7/-6) lib/lp/registry/model/distribution.py (+12/-15) lib/lp/registry/model/distributionsourcepackage.py (+2/-2) lib/lp/registry/model/distroseries.py (+1/-1) lib/lp/registry/model/distroseriesdifference.py (+5/-6) lib/lp/registry/model/mailinglist.py (+1/-2) lib/lp/registry/model/person.py (+180/-142) lib/lp/registry/model/pillar.py (+20/-15) lib/lp/registry/model/productrelease.py (+1/-1) lib/lp/registry/model/sharingjob.py (+3/-3) lib/lp/registry/model/teammembership.py (+14/-1) lib/lp/registry/personmerge.py (+1/-2) lib/lp/registry/scripts/closeaccount.py (+1/-1) lib/lp/registry/scripts/populate_distroseriesdiff.py (+1/-1) lib/lp/registry/security.py (+19/-1) lib/lp/registry/stories/distributionmirror/xx-reassign-distributionmirror.rst (+5/-2) lib/lp/registry/stories/person/xx-approve-members.rst (+3/-1) lib/lp/registry/stories/productrelease/xx-productrelease-basics.rst (+1/-1) lib/lp/registry/stories/productrelease/xx-productrelease-view.rst (+5/-2) lib/lp/registry/stories/teammembership/xx-add-member.rst (+5/-3) lib/lp/registry/stories/teammembership/xx-teammembership.rst (+5/-4) lib/lp/registry/tests/test_person.py (+6/-6) lib/lp/registry/tests/test_teammembership.py (+1/-1) lib/lp/registry/vocabularies.py (+18/-20) lib/lp/scripts/garbo.py (+1/-1) lib/lp/scripts/harness.py (+1/-1) lib/lp/services/apachelogparser/model/parsedapachelog.py (+6/-3) lib/lp/services/auth/tests/test_model.py (+57/-24) lib/lp/services/authserver/tests/test_authserver.py (+2/-2) lib/lp/services/authserver/xmlrpc.py (+2/-2) lib/lp/services/database/doc/security-proxies.rst (+12/-10) lib/lp/services/database/doc/storm-security-proxies.rst (+2/-2) lib/lp/services/database/interfaces.py (+0/-11) lib/lp/services/database/multitablecopy.py (+5/-5) lib/lp/services/database/postgresql.py (+3/-3) lib/lp/services/database/sqlbase.py (+40/-223) lib/lp/services/database/sqlobject/__init__.py (+1/-26) lib/lp/services/database/tests/test_transaction_decorators.py (+3/-1) lib/lp/services/features/model.py (+1/-2) lib/lp/services/librarian/client.py (+4/-8) lib/lp/services/librarian/model.py (+81/-69) lib/lp/services/librarian/tests/test_client.py (+6/-5) lib/lp/services/librarianserver/db.py (+19/-12) lib/lp/services/librarianserver/librariangc.py (+3/-3) lib/lp/services/librarianserver/storage.py (+4/-3) lib/lp/services/librarianserver/testing/fake.py (+6/-3) lib/lp/services/librarianserver/testing/server.py (+2/-1) lib/lp/services/librarianserver/tests/test_db.py (+9/-8) lib/lp/services/librarianserver/tests/test_gc.py (+78/-69) lib/lp/services/librarianserver/tests/test_storage.py (+8/-3) lib/lp/services/librarianserver/tests/test_storage_db.py (+10/-4) lib/lp/services/librarianserver/tests/test_web.py (+1/-1) lib/lp/services/librarianserver/web.py (+1/-1) lib/lp/services/messages/interfaces/message.py (+8/-2) lib/lp/services/messages/model/message.py (+1/-2) lib/lp/services/openid/model/openididentifier.py (+6/-3) lib/lp/services/session/model.py (+5/-4) lib/lp/services/statistics/tests/test_update_stats.py (+1/-1) lib/lp/services/tarfile_helpers.py (+0/-10) lib/lp/services/verification/doc/logintoken.rst (+6/-5) lib/lp/services/webapp/configure.zcml (+0/-8) lib/lp/services/webapp/database.zcml (+0/-3) lib/lp/services/webapp/marshallers.py (+2/-3) lib/lp/services/webapp/snapshot.py (+4/-5) lib/lp/services/webapp/tests/test_servers.py (+26/-14) lib/lp/services/webapp/vocabulary.py (+1/-164) lib/lp/services/webservice/configure.zcml (+0/-14) lib/lp/services/webservice/doc/webservice-marshallers.rst (+7/-7) lib/lp/services/worlddata/interfaces/language.py (+2/-8) lib/lp/snappy/browser/snapbase.py (+2/-4) lib/lp/snappy/model/snap.py (+1/-1) lib/lp/snappy/model/snapbuild.py (+3/-3) lib/lp/snappy/templates/snap-new.pt (+4/-4) lib/lp/soyuz/browser/archive.py (+2/-4) lib/lp/soyuz/browser/queue.py (+2/-2) lib/lp/soyuz/browser/tests/distroseriesqueue-views.rst (+2/-1) lib/lp/soyuz/doc/gina-multiple-arch.rst (+2/-2) lib/lp/soyuz/doc/gina.rst (+8/-5) lib/lp/soyuz/doc/package-diff.rst (+3/-2) lib/lp/soyuz/doc/soyuz-set-of-uploads.rst (+2/-2) lib/lp/soyuz/model/archive.py (+153/-117) lib/lp/soyuz/model/archivefile.py (+2/-2) lib/lp/soyuz/model/archivesubscriber.py (+1/-1) lib/lp/soyuz/model/binarypackagebuild.py (+4/-4) lib/lp/soyuz/model/distributionsourcepackagerelease.py (+2/-2) lib/lp/soyuz/model/initializedistroseriesjob.py (+3/-1) lib/lp/soyuz/model/livefsbuild.py (+2/-2) lib/lp/soyuz/model/packagecloner.py (+8/-8) lib/lp/soyuz/model/packagediff.py (+1/-1) lib/lp/soyuz/model/publishing.py (+9/-13) lib/lp/soyuz/model/queue.py (+2/-2) lib/lp/soyuz/model/sourcepackagerelease.py (+1/-1) lib/lp/soyuz/scripts/gina/README (+1/-1) lib/lp/soyuz/scripts/initialize_distroseries.py (+2/-2) lib/lp/soyuz/scripts/packagecopier.py (+1/-1) lib/lp/soyuz/tests/test_archive.py (+14/-15) lib/lp/soyuz/tests/test_initializedistroseriesjob.py (+48/-25) lib/lp/soyuz/tests/test_packagediff.py (+1/-1) lib/lp/soyuz/vocabularies.py (+16/-19) lib/lp/testing/__init__.py (+6/-3) lib/lp/testing/factory.py (+2/-0) lib/lp/testing/html5browser.py (+1/-1) lib/lp/testing/layers.py (+28/-2) lib/lp/testing/tests/test_html5browser.py (+7/-7) lib/lp/translations/doc/rosetta-karma.rst (+2/-2) lib/lp/translations/doc/rosetta-translation.rst (+4/-4) lib/lp/translations/doc/translationmessage-destroy.rst (+1/-2) lib/lp/translations/model/distroserieslanguage.py (+1/-1) lib/lp/translations/model/poexportrequest.py (+1/-1) lib/lp/translations/model/pofile.py (+2/-2) lib/lp/translations/model/potemplate.py (+1/-1) lib/lp/translations/model/translationgroup.py (+5/-5) lib/lp/translations/scripts/fix_plural_forms.py (+2/-5) lib/lp/translations/scripts/tests/test_remove_translations.py (+4/-4) scripts/librarian-report.py (+3/-3) utilities/make-dummy-hosted-branches (+3/-3) utilities/snakefood/Makefile (+2/-2) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Simone Pelosi | Approve | ||
Review via email: mp+452145@code.qastaging.launchpad.net |
Commit message
Merge branch 'master' into db-devel
This merge is needed in an attempt for the tests in the buildbot to not fail as often (there is a test fix merged into master, and a few other changes that could potentially help with the tests)
To post a comment you must log in.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
LGTM!