Merge launchpad:master into launchpad:db-devel
Proposed by
Colin Watson
| Status: | Merged |
|---|---|
| Approved by: | Colin Watson |
| Approved revision: | 0ae05b82a9b984ea0c0221d9284ef9a655cbf632 |
| Merge reported by: | Otto Co-Pilot |
| Merged at revision: | not available |
| Proposed branch: | launchpad:master |
| Merge into: | launchpad:db-devel |
| Diff against target: |
70 lines (+36/-1) 3 files modified
lib/lp/code/model/branch.py (+3/-1) lib/lp/snappy/browser/snap.py (+4/-0) lib/lp/snappy/browser/tests/test_snap.py (+29/-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_bzrsync.
Description of the change
These sneaked through to db-devel due to a buildbot subunit parsing bug of some kind.
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
