MAAS

Merge lp:~julian-edwards/maas/1.3-ignore-client-uids into lp:maas/1.3

  1. 1.3-ignore-client-uids
  2. Merge into 1.3
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 1466
Proposed branch: lp:~julian-edwards/maas/1.3-ignore-client-uids
Merge into: lp:maas/1.3
Diff against target: 11 lines (+1/-0)
1 file modified
src/provisioningserver/dhcp/config.py (+1/-0)
To merge this branch: bzr merge lp:~julian-edwards/maas/1.3-ignore-client-uids
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+167442@code.launchpad.net

Commit message

Backport r1482 from trunk: 'ignore-client-uids true' in dhcpd.conf.template

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/dhcp/config.py'
2--- src/provisioningserver/dhcp/config.py 2012-11-22 03:18:35 +0000
3+++ src/provisioningserver/dhcp/config.py 2013-06-05 03:47:25 +0000
4@@ -29,6 +29,7 @@
5 template_content = dedent("""\
6 subnet {{subnet}} netmask {{subnet_mask}} {
7 filename "{{bootloader}}";
8+ ignore-client-uids true;
9 option subnet-mask {{subnet_mask}};
10 option broadcast-address {{broadcast_ip}};
11 option domain-name-servers {{dns_servers}};

Subscribers

People subscribed via source and target branches