Merge lp://qastaging/~jtv/maas/1.5-bug-1306335 into lp://qastaging/maas/1.5

Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 2242
Proposed branch: lp://qastaging/~jtv/maas/1.5-bug-1306335
Merge into: lp://qastaging/maas/1.5
Diff against target: 32 lines (+10/-1)
2 files modified
etc/maas/templates/dhcp/dhcpd.conf.template (+1/-1)
src/provisioningserver/dhcp/tests/test_config.py (+9/-0)
To merge this branch: bzr merge lp://qastaging/~jtv/maas/1.5-bug-1306335
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Review via email: mp+215349@code.qastaging.launchpad.net

Commit message

Backport trunk r2257: Quote interface name in dhcpd.conf; required when the interface name contains dots (or perhaps other strange characters).

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Straight backport; self-approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: