Merge lp:~allenap/maas/packaging.remove-cron-jobs into lp:~maas-maintainers/maas/packaging

[Gavin Panella]

Don't install the maas-import-pxe-files cron job.

[Julian Edwards (julian-edwards)]

review: Approve

[MAAS Lander (maas-lander)]

No commit message specified.

[MAAS Lander (maas-lander)]

Attempt to merge into lp:~maas-maintainers/maas/packaging failed due to conflicts:

text conflict in debian/maas-cluster-controller.install

[lp:~allenap/maas/packaging.remove-cron-jobs]

149. By Gavin Panella on 2012-11-22

Don't install the maas-import-pxe-files cron job.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-22 07:28:16 +0000
+++ debian/changelog	2012-11-22 10:51:19 +0000
@@ -32,6 +32,8 @@
   * debian/extras/99-maas: squashfs image download is no longer needed.
   * debian/maas-cluster-controller.install: maas-import-squashfs and its
     configuration file are no longer part of upstream.
+  * debian/maas-cluster-controller.install: The maas-import-pxe-files cron
+    task is no longer used.
 
   [ Andres Rodriguez ]
   * debian/control:

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2012-11-22 07:28:16 +0000
+++ debian/maas-cluster-controller.install	2012-11-22 10:51:19 +0000
@@ -15,7 +15,6 @@
 
 # Install maas-import-pxe-files and related files
 debian/tmp/usr/sbin/maas-import-pxe-files
-etc/cron.d/maas-import-pxe-files
 docs/man/maas-import-pxe-files.8 usr/share/man/man8
 debian/tmp/etc/maas/import_pxe_files
 debian/tmp/usr/sbin/maas-import-ephemerals