Merge lp:~andreserl/maas/packaging_1.8.3 into lp:~maas-maintainers/maas/packaging-1.8

[Andres Rodriguez]

* New upstream release, 1.8.3 bzr 4050:
  - Declare dependency on metadataserver migration 0015 by maasserver
    migration 0121 to allow upgrades from 1.5.4 to 1.8 to work. (LP: #1495064)
  - Fix the issue where the included ':', apache2 wont forward the
    connection (LP: #1484696)
  - Fixes autocomplete styling for tagging (LP: #1489160)
  - Add HPDSA hardware drivers to the drivers config (LP: #1491898)
  - Always invoke the init system using the C.UTF-8 locale. (LP: #1491822)
  - Use cluster_name instead of name for the cluster, otherwise the UI
    will show the DNS zone name instead of the actual cluster name.
* debian/control: Restart maas-clusterd in the event it failed to start
  due to missing /var/lib/maas/secret (LP: #1471946)

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-25 15:17:56 +0000
+++ debian/changelog	2015-10-09 05:07:56 +0000
@@ -1,3 +1,20 @@
+maas (1.8.3+bzr4050-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.3 bzr 4050:
+    - Declare dependency on metadataserver migration 0015 by maasserver
+      migration 0121 to allow upgrades from 1.5.4 to 1.8 to work. (LP: #1495064)
+    - Fix the issue where the included ':', apache2 wont forward the
+      connection (LP: #1484696)
+    - Fixes autocomplete styling for tagging (LP: #1489160)
+    - Add HPDSA hardware drivers to the drivers config (LP: #1491898)
+    - Always invoke the init system using the C.UTF-8 locale. (LP: #1491822)
+    - Use cluster_name instead of name for the cluster, otherwise the UI
+      will show the DNS zone name instead of the actual cluster name.
+  * debian/control: Restart maas-clusterd in the event it failed to start
+    due to missing /var/lib/maas/secret (LP: #1471946) 
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 08 Oct 2015 21:53:04 -0700
+
 maas (1.8.2+bzr4041-0ubuntu1) trusty; urgency=medium
 
   * New upstream release, 1.8.2 bzr 4041:
 
=== modified file 'debian/maas-cluster-controller.maas-clusterd.service'
--- debian/maas-cluster-controller.maas-clusterd.service	2015-05-21 16:54:25 +0000
+++ debian/maas-cluster-controller.maas-clusterd.service	2015-10-09 05:07:56 +0000
@@ -12,6 +12,7 @@
 User=maas
 Group=maas
 Restart=always
+RestartSec=10s
 EnvironmentFile=/etc/maas/maas_cluster.conf
 Environment="LOGFILE=/var/log/maas/clusterd.log"
 # Logs go to the journal; read them with