Merge launchpad:master into launchpad:db-devel
Proposed by
Colin Watson
| Status: | Merged |
|---|---|
| Approved by: | Colin Watson |
| Approved revision: | 8d28b7c56f3ac7f0d39ec1c263268ffb0b42c676 |
| Merge reported by: | Otto Co-Pilot |
| Merged at revision: | not available |
| Proposed branch: | launchpad:master |
| Merge into: | launchpad:db-devel |
| Diff against target: |
1621 lines (+273/-801) 18 files modified
dev/null (+0/-139) lib/lp/archivepublisher/publishing.py (+3/-28) lib/lp/archivepublisher/scripts/generate_ppa_htaccess.py (+11/-206) lib/lp/archivepublisher/tests/test_generate_ppa_htaccess.py (+1/-351) lib/lp/archivepublisher/tests/test_publisher.py (+0/-39) lib/lp/oci/model/ocirecipebuildjob.py (+8/-4) lib/lp/oci/tests/test_ocirecipebuildjob.py (+5/-10) lib/lp/registry/browser/distribution.py (+0/-3) lib/lp/registry/interfaces/distribution.py (+42/-1) lib/lp/registry/model/distribution.py (+28/-0) lib/lp/registry/scripts/closeaccount.py (+3/-6) lib/lp/registry/tests/test_distribution.py (+91/-1) lib/lp/registry/tests/test_personmerge.py (+2/-2) lib/lp/services/scripts/base.py (+0/-4) lib/lp/snappy/model/snap.py (+0/-7) lib/lp/soyuz/scripts/expire_archive_files.py (+3/-0) lib/lp/testing/layers.py (+18/-0) utilities/manage-celery-workers.sh (+58/-0) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Manually merge from master to fix test failure on Python 2
Description of the change
The bug fixed in 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
