Merge ~jorge-merlino/maas:lp2027621-3.1 into maas:3.1
Proposed by
Jorge Merlino
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jacopo Rota | ||||
Approved revision: | 45009bd03d2d80410599429dc5040aabea537a3e | ||||
Merge reported by: | MAAS Lander | ||||
Merged at revision: | not available | ||||
Proposed branch: | ~jorge-merlino/maas:lp2027621-3.1 | ||||
Merge into: | maas:3.1 | ||||
Diff against target: |
286 lines (+123/-21) 2 files modified
src/maasserver/dhcp.py (+15/-9) src/maasserver/tests/test_dhcp.py (+108/-12) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jacopo Rota | Approve | ||
MAAS Lander | Approve | ||
Review via email:
|
Commit message
cherry pick ecb92f26d3d0735
Description of the change
cherry pick ecb92f26d3d0735
To post a comment you must log in.
UNIT TESTS
-b lp2027621-3.1 lp:~jorge-merlino/maas/+git/maas into -b 3.1 lp:~maas-committers/maas
STATUS: FAILED maas-ci. internal: 8080/job/ maas-tester/ 3184/console 10599429dc5040a abea537a3e
LOG: http://
COMMIT: 45009bd03d2d804