Merge lp:~vila/bzr/fixing-tarmac into lp:~bzr-pqm/bzr/test-tarmac
Proposed by
Vincent Ladeuil
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | 6624 |
Merge reported by: | bzr PQM |
Merged at revision: | not available |
Proposed branch: | lp:~vila/bzr/fixing-tarmac |
Merge into: | lp:~bzr-pqm/bzr/test-tarmac |
Diff against target: |
98 lines (+34/-5) 4 files modified
Makefile (+1/-1) bzrlib/transport/sftp.py (+12/-4) ols-vms.conf (+13/-0) tools/setup-testbed (+8/-0) |
To merge this branch: | bzr merge lp:~vila/bzr/fixing-tarmac |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve | ||
Review via email: mp+301194@code.launchpad.net |
Commit message
This should only land in lp:~bzr-pqm/bzr/test-tarmac
Description of the change
Testing tarmac, no review needed, thanks anyway ;)
To post a comment you must log in.
The attempt to merge lp:~vila/bzr/fixing-tarmac into lp:~bzr-pqm/bzr/test-tarmac failed. Below is the output from the failed tests.
Warning: Permanently added '10.0.8.174' (ECDSA) to the list of known hosts.
/bin/sh: 1: make: not found