Merge launchpad:stable into launchpad:db-devel
Proposed by
Colin Watson
| Status: | Merged |
|---|---|
| Approved by: | Colin Watson |
| Approved revision: | f92b6e0bb2624f8a9125e3f45b7621c6e230c5ff |
| Merge reported by: | Otto Co-Pilot |
| Merged at revision: | not available |
| Proposed branch: | launchpad:stable |
| Merge into: | launchpad:db-devel |
| Diff against target: |
1977 lines (+959/-49) 34 files modified
Makefile (+61/-9) database/sampledata/current-dev.sql (+2/-2) database/sampledata/current.sql (+2/-2) lib/lp/_schema_circular_imports.py (+10/-1) lib/lp/archivepublisher/publishing.py (+4/-2) lib/lp/archivepublisher/tests/test_publisher.py (+40/-0) lib/lp/code/browser/configure.zcml (+6/-0) lib/lp/code/browser/gitrepository.py (+13/-0) lib/lp/code/configure.zcml (+34/-0) lib/lp/code/enums.py (+50/-0) lib/lp/code/interfaces/gitrepository.py (+195/-0) lib/lp/code/interfaces/webservice.py (+2/-0) lib/lp/code/model/gitrepository.py (+158/-1) lib/lp/code/model/tests/test_gitrepository.py (+197/-0) lib/lp/registry/configure.zcml (+2/-1) lib/lp/registry/doc/distribution-mirror.txt (+12/-5) lib/lp/registry/interfaces/distroseries.py (+10/-1) lib/lp/registry/model/distributionmirror.py (+5/-4) lib/lp/registry/model/distroseries.py (+10/-0) lib/lp/registry/model/person.py (+1/-1) lib/lp/registry/tests/test_distributionmirror.py (+15/-7) lib/lp/registry/tests/test_distroseries.py (+11/-1) lib/lp/security.py (+19/-0) lib/lp/services/config/schema-lazr.conf (+4/-0) lib/lp/services/librarianserver/swift.py (+1/-0) lib/lp/services/librarianserver/tests/test_swift.py (+9/-0) lib/lp/services/webapp/tests/test_servers.py (+8/-0) lib/lp/services/webservice/configuration.py (+19/-4) lib/lp/soyuz/scripts/initialize_distroseries.py (+4/-1) lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py (+3/-1) lib/lp/testing/factory.py (+29/-1) lib/lp/testing/swift/fakeswift.py (+2/-0) lib/lp/translations/scripts/po_import.py (+2/-5) lib/lp/translations/scripts/tests/test_translations_import.py (+19/-0) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Manually merge from stable to fix time-dependent tests
Description of the change
This is needed on db-devel to make tests pass again; see 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
