Merge lp:~lamont/maas/bug-1564925 into lp:~maas-committers/maas/trunk
Proposed by
LaMont Jones
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | LaMont Jones | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 4866 | ||||
Proposed branch: | lp:~lamont/maas/bug-1564925 | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
275 lines (+63/-38) 3 files modified
src/provisioningserver/dhcp/testing/config.py (+13/-6) src/provisioningserver/dhcp/tests/test_config.py (+49/-31) src/provisioningserver/templates/dhcp/dhcpd6.conf.template (+1/-1) |
||||
To merge this branch: | bzr merge lp:~lamont/maas/bug-1564925 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+290765@code.launchpad.net |
Commit message
Generate correct dhcpd6.conf configuration.
Description of the change
Generate correct dhcpd6.conf configuration.
To post a comment you must log in.
Looks good. Thanks for the quick fix. Testing was more work than fixing the bug. ;-)