Merge lp:~cjwatson/launchpad/fix-buildmaster-twisted-agent into lp:launchpad
Proposed by
Colin Watson
Status: | Merged |
---|---|
Merged at revision: | 18071 |
Proposed branch: | lp:~cjwatson/launchpad/fix-buildmaster-twisted-agent |
Merge into: | lp:launchpad |
Diff against target: |
141 lines (+41/-9) 5 files modified
lib/lp/buildmaster/interactor.py (+14/-5) lib/lp/buildmaster/manager.py (+2/-1) lib/lp/buildmaster/model/buildfarmjobbehaviour.py (+4/-3) lib/lp/buildmaster/tests/mock_slaves.py (+5/-0) lib/lp/buildmaster/tests/test_interactor.py (+16/-0) |
To merge this branch: | bzr merge lp:~cjwatson/launchpad/fix-buildmaster-twisted-agent |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson (community) | Approve | ||
Review via email: mp+295833@code.launchpad.net |
Commit message
Fix BuilderSlave.
Description of the change
Fix BuilderSlave.
I also improved the logging a bit, so that we can see builder-side URLs again. The new downloader makes this a bit harder, since a factory is no longer associated with a single URL, but the results of this are reasonably tolerable on dogfood.
To post a comment you must log in.