MAAS

Merge lp:~jtv/maas/dhcpd6-conf-filename-typo into lp:~maas-committers/maas/trunk

  1. dhcpd6-conf-filename-typo
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 2842
Proposed branch: lp:~jtv/maas/dhcpd6-conf-filename-typo
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/provisioningserver/rpc/dhcp.py (+1/-1)
To merge this branch: bzr merge lp:~jtv/maas/dhcpd6-conf-filename-typo
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+232522@code.launchpad.net

Commit message

Fix typo in DHCPv6 config filename.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/rpc/dhcp.py'
2--- src/provisioningserver/rpc/dhcp.py 2014-08-26 12:45:43 +0000
3+++ src/provisioningserver/rpc/dhcp.py 2014-08-28 09:09:17 +0000
4@@ -37,7 +37,7 @@
5 maaslog = get_maas_logger("dhcp")
6
7 # Location of the DHCPv6 configuration file.
8-DHCPv6_CONFIG_FILE = '/etc/maas/dhcp6.conf'
9+DHCPv6_CONFIG_FILE = '/etc/maas/dhcpd6.conf'
10
11 # Location of the DHCPv6 interfaces file.
12 DHCPv6_INTERFACES_FILE = '/var/lib/maas/dhcpd6-interfaces'