Merge lp:~andreserl/maas/packaging_lp1446699 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

debian/maas-dhcpd.maas-dhcpd.service: Remove whitespace in unit that was making systemd crash (LP: #1446699)

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-21 17:01:19 +0000
+++ debian/changelog	2015-04-22 17:08:57 +0000
@@ -1,6 +1,7 @@
 maas (1.8.0~beta4+bzr3825-0ubuntu1) UNRELEASED; urgency=medium
 
-  * UNRELEASED
+  * debian/maas-dhcpd.maas-dhcpd.service: Remove whitespace in unit that
+    was making systemd crash (LP: #1446699)
 
  -- Andres Rodriguez <[e-mail]>  Tue, 21 Apr 2015 13:00:49 -0400
 

=== modified file 'debian/maas-dhcp.maas-dhcpd.service'
--- debian/maas-dhcp.maas-dhcpd.service	2015-04-01 11:35:09 +0000
+++ debian/maas-dhcp.maas-dhcpd.service	2015-04-22 17:08:57 +0000
@@ -20,7 +20,7 @@
     LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases; \
     [ -e $LEASES_FILE ] || touch $LEASES_FILE; \
     chown root:root /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd.leases*; \
-    exec dhcpd -user dhcpd -group dhcpd -f -q -4 -pf /run/maas/dhcp/dhcpd.pid \ 
+    exec dhcpd -user dhcpd -group dhcpd -f -q -4 -pf /run/maas/dhcp/dhcpd.pid \
         -cf /etc/maas/dhcpd.conf -lf $LEASES_FILE $INTERFACES'
 
 [Install]