Merge lp:~andreserl/maas/maas_tftppath_lp1042877 into lp:~maas-committers/maas/trunk
Proposed by
Andres Rodriguez
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Julian Edwards | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 940 | ||||
Proposed branch: | lp:~andreserl/maas/maas_tftppath_lp1042877 | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
56 lines (+5/-5) 3 files modified
etc/pserv.yaml (+1/-1) src/provisioningserver/config.py (+1/-1) src/provisioningserver/pxe/tftppath.py (+3/-3) |
||||
To merge this branch: | bzr merge lp:~andreserl/maas/maas_tftppath_lp1042877 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Julian Edwards (community) | Approve | ||
Review via email: mp+121676@code.launchpad.net |
Commit message
Fixes incorrect TFTP path to not prepend maas/
To post a comment you must log in.
This branch does not pass tests. Andres, did you run “make test” or “make check” before putting this up for review? Lots of failing tests in trunk now. :(