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

[Andres Rodriguez]

Open beta3
Release beta2

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-13 03:16:01 +0000
+++ debian/changelog	2016-04-14 15:57:30 +0000
@@ -1,9 +1,15 @@
-maas (2.0.0~beta2+bzr4889-0ubuntu1) UNRELEASED; urgency=medium
+maas (2.0.0~beta3+bzr4920-0ubuntu1) UNRELEASED; urgency=medium
 
   * UNRELEASED
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 14 Apr 2016 11:54:02 -0400
+
+maas (2.0.0~beta2+bzr4920-0ubuntu1) xenial; urgency=medium
+
+  * New upstream release, 2.0.0 beta 2 bzr4920 (Standing FFe LP: #1553261)
   * Only create the squid cache if we have a configuration file.
     LP: #1568847
-  * Add shared debconf templates.
+  * Re-add shared debconf templates.
 
  -- Andres Rodriguez <[e-mail]>  Thu, 07 Apr 2016 18:22:00 -0400
 

=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot	2012-10-04 18:52:27 +0000
+++ debian/po/templates.pot	2016-04-14 15:57:30 +0000
@@ -66,17 +66,3 @@
 "clients. If the automatically detected address is not in the same network as "
 "the clients, it must be changed."
 msgstr ""
-
-#. Type: string
-#. Description
-#: ../maas-cluster-controller.templates:1001
-msgid "Ubuntu MAAS API address:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../maas-cluster-controller.templates:1001
-msgid ""
-"The MAAS Cluster Controller needs to contact the MAAS server to register its "
-"presence.  Set the URL to the MAAS API here, e.g. http://192.168.1.1/MAAS"
-msgstr ""