Merge lp:~blake-rouse/maas/fix-1521618 into lp:~maas-committers/maas/trunk
Proposed by
Blake Rouse
Status: | Merged |
---|---|
Approved by: | Blake Rouse |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5018 |
Proposed branch: | lp:~blake-rouse/maas/fix-1521618 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
32 lines (+9/-6) 1 file modified
src/provisioningserver/templates/dhcp/dhcpd.conf.template (+9/-6) |
To merge this branch: | bzr merge lp:~blake-rouse/maas/fix-1521618 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+294553@code.launchpad.net |
Commit message
Move class PXE to global in dhcpd.conf.
Description of the change
I have QA'd this by testing that PXE booting still works and that the gateway_ip is not sent from the other subnet. This does resolve the bug.
To post a comment you must log in.
Self-approving as it just changes its location and I fully QA'd this.