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

Proposed by Andres Rodriguez on 2016-04-14
Status: Merged
Approved by: Andres Rodriguez on 2016-04-14
Approved revision: 485
Merged at revision: 484
Proposed branch: lp:~andreserl/maas/release_beta2_open_beta3
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 43 lines (+8/-16)
2 files modified
debian/changelog (+8/-2)
debian/po/templates.pot (+0/-14)
To merge this branch: bzr merge lp:~andreserl/maas/release_beta2_open_beta3
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2016-04-14
Review via email: mp+291911@code.launchpad.net

Commit message

Open beta3
Release beta2

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-04-13 03:16:01 +0000
3+++ debian/changelog 2016-04-14 15:57:30 +0000
4@@ -1,9 +1,15 @@
5-maas (2.0.0~beta2+bzr4889-0ubuntu1) UNRELEASED; urgency=medium
6+maas (2.0.0~beta3+bzr4920-0ubuntu1) UNRELEASED; urgency=medium
7
8 * UNRELEASED
9+
10+ -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 14 Apr 2016 11:54:02 -0400
11+
12+maas (2.0.0~beta2+bzr4920-0ubuntu1) xenial; urgency=medium
13+
14+ * New upstream release, 2.0.0 beta 2 bzr4920 (Standing FFe LP: #1553261)
15 * Only create the squid cache if we have a configuration file.
16 LP: #1568847
17- * Add shared debconf templates.
18+ * Re-add shared debconf templates.
19
20 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 07 Apr 2016 18:22:00 -0400
21
22
23=== modified file 'debian/po/templates.pot'
24--- debian/po/templates.pot 2012-10-04 18:52:27 +0000
25+++ debian/po/templates.pot 2016-04-14 15:57:30 +0000
26@@ -66,17 +66,3 @@
27 "clients. If the automatically detected address is not in the same network as "
28 "the clients, it must be changed."
29 msgstr ""
30-
31-#. Type: string
32-#. Description
33-#: ../maas-cluster-controller.templates:1001
34-msgid "Ubuntu MAAS API address:"
35-msgstr ""
36-
37-#. Type: string
38-#. Description
39-#: ../maas-cluster-controller.templates:1001
40-msgid ""
41-"The MAAS Cluster Controller needs to contact the MAAS server to register its "
42-"presence. Set the URL to the MAAS API here, e.g. http://192.168.1.1/MAAS"
43-msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: