Merge lp:~vila/bzr/fixing-tarmac into lp:~bzr-pqm/bzr/test-tarmac
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil on 2016-08-01 |
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 on 2016-07-26 | ||
Review via email:
|
Commit message
This should only land in lp:~bzr-pqm/bzr/test-tarmac
Description of the change
Testing tarmac, no review needed, thanks anyway ;)
bzr PQM (bzr-pqm) wrote : | # |
bzr PQM (bzr-pqm) wrote : | # |
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.
building extension modules.
python setup.py build_ext -i
No Cython, trying Pyrex...
running build_ext
pyrexc bzrlib/
building 'bzrlib.
creating build
creating build/temp.
creating build/temp.
x86_64-
x86_64-
pyrexc bzrlib/
building 'bzrlib.
x86_64-
x86_64-
pyrexc bzrlib/
building 'bzrlib.
x86_64-
x86_64-
pyrexc bzrlib/
bu...
bzr PQM (bzr-pqm) wrote : | # |
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.
building extension modules.
python setup.py build_ext -i
No Cython, trying Pyrex...
running build_ext
pyrexc bzrlib/
building 'bzrlib.
creating build
creating build/temp.
creating build/temp.
x86_64-
x86_64-
pyrexc bzrlib/
building 'bzrlib.
x86_64-
x86_64-
pyrexc bzrlib/
building 'bzrlib.
x86_64-
x86_64-
pyrexc bzrlib/
bu...
bzr PQM (bzr-pqm) wrote : | # |
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.
building extension modules.
python setup.py build_ext -i
No Cython, trying Pyrex...
running build_ext
pyrexc bzrlib/
building 'bzrlib.
creating build
creating build/temp.
creating build/temp.
x86_64-
x86_64-
pyrexc bzrlib/
building 'bzrlib.
x86_64-
x86_64-
pyrexc bzrlib/
building 'bzrlib.
x86_64-
x86_64-
pyrexc bzrlib/
- 6623. By Vincent Ladeuil on 2016-08-01
-
subunit is needed for subunit-stats
- 6624. By Vincent Ladeuil on 2016-08-01
-
subunit defaults to v2 now.
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