Merge lp:~thumper/launchpad/fix-codeimport-failure into lp:launchpad/db-devel
Proposed by
Tim Penhey
Status: | Merged |
---|---|
Approved by: | Jonathan Lange |
Approved revision: | no longer in the source branch. |
Merged at revision: | not available |
Proposed branch: | lp:~thumper/launchpad/fix-codeimport-failure |
Merge into: | lp:launchpad/db-devel |
Diff against target: |
92 lines (+8/-7) 7 files modified
lib/lp/buildmaster/interfaces/builder.py (+0/-2) lib/lp/code/model/tests/test_codeimport.py (+1/-0) lib/lp/soyuz/browser/tests/builder-views.txt (+2/-1) lib/lp/soyuz/doc/build-estimated-dispatch-time.txt (+1/-1) lib/lp/soyuz/doc/buildd-slavescanner.txt (+2/-1) lib/lp/soyuz/doc/buildqueue.txt (+1/-1) lib/lp/soyuz/interfaces/buildqueue.py (+1/-1) |
To merge this branch: | bzr merge lp:~thumper/launchpad/fix-codeimport-failure |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jonathan Lange (community) | Approve | ||
Review via email: mp+17315@code.launchpad.net |
Commit message
Fix issue with soyuz builder move, and fix broken code import test.
To post a comment you must log in.
fixes the issue with the soyuz builder move, and fixes the broken code import test.