MAAS

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

  1. release_beta3
  2. Merge into packaging
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 488
Merged at revision: 486
Proposed branch: lp:~andreserl/maas/release_beta3
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 164 lines (+52/-44)
5 files modified
debian/changelog (+9/-1)
debian/maas-common.templates (+2/-2)
debian/maas-rack-controller.templates (+2/-2)
debian/po/POTFILES.in (+0/-1)
debian/po/templates.pot (+39/-38)
To merge this branch: bzr merge lp:~andreserl/maas/release_beta3
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+292460@code.launchpad.net

Commit message

Release beta 3
Open beta 4

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2016-04-16 02:28:29 +0000
+++ debian/changelog 2016-04-21 02:44:47 +0000
@@ -1,7 +1,15 @@
1maas (2.0.0~beta2+bzr4920-0ubuntu3) UNRELEASED; urgency=medium1maas (2.0.0~beta4+bzr4941-0ubuntu1) UNRELEASED; urgency=medium
22
3 * UNRELEASED3 * UNRELEASED
44
5 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 20 Apr 2016 22:43:22 -0400
6
7maas (2.0.0~beta3+bzr4941-0ubuntu1) xenial; urgency=medium
8
9 * New upstream release, 2.0.0 beta 3 bzr4941 (Standing FFe LP: #1553261)
10 * Remove some leftover references to Cluster.
11 * Run debconf-updatepo.
12
5 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 15 Apr 2016 22:27:56 -040013 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 15 Apr 2016 22:27:56 -0400
614
7maas (2.0.0~beta2+bzr4920-0ubuntu2) xenial; urgency=medium15maas (2.0.0~beta2+bzr4920-0ubuntu2) xenial; urgency=medium
816
=== modified file 'debian/maas-common.templates'
--- debian/maas-common.templates 2016-04-13 13:28:03 +0000
+++ debian/maas-common.templates 2016-04-21 02:44:47 +0000
@@ -48,6 +48,6 @@
4848
49Template: maas-rack-controller/shared-secret49Template: maas-rack-controller/shared-secret
50Type: password50Type: password
51_Description: MAAS Cluster Controller Shared Secret:51_Description: MAAS Rack Controller Shared Secret:
52 The MAAS Cluster Controller needs to contact the MAAS server52 The MAAS Rack Controller needs to contact the MAAS server
53 with a share secret. Set the shared secret here.53 with a share secret. Set the shared secret here.
5454
=== modified file 'debian/maas-rack-controller.templates'
--- debian/maas-rack-controller.templates 2016-04-13 13:28:03 +0000
+++ debian/maas-rack-controller.templates 2016-04-21 02:44:47 +0000
@@ -9,6 +9,6 @@
99
10Template: maas-rack-controller/shared-secret10Template: maas-rack-controller/shared-secret
11Type: password11Type: password
12_Description: MAAS Cluster Controller Shared Secret:12_Description: MAAS Rack Controller Shared Secret:
13 The MAAS Cluster Controller needs to contact the MAAS server13 The MAAS Rack Controller needs to contact the MAAS server
14 with a share secret. Set the shared secret here.14 with a share secret. Set the shared secret here.
1515
=== modified file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in 2012-10-04 18:52:27 +0000
+++ debian/po/POTFILES.in 2016-04-21 02:44:47 +0000
@@ -1,2 +1,1 @@
1[type: gettext/rfc822deb] maas-region-controller.templates1[type: gettext/rfc822deb] maas-region-controller.templates
2[type: gettext/rfc822deb] maas-cluster-controller.templates
32
=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot 2016-04-14 15:53:34 +0000
+++ debian/po/templates.pot 2016-04-21 02:44:47 +0000
@@ -1,6 +1,6 @@
1# SOME DESCRIPTIVE TITLE.1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the PACKAGE package.3# This file is distributed under the same license as the maas package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#5#
6#, fuzzy6#, fuzzy
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: maas\n"9"Project-Id-Version: maas\n"
10"Report-Msgid-Bugs-To: maas@packages.debian.org\n"10"Report-Msgid-Bugs-To: maas@packages.debian.org\n"
11"POT-Creation-Date: 2012-10-04 13:40-0400\n"11"POT-Creation-Date: 2016-04-20 12:24-0400\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,52 +17,53 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#. Type: note
21#. Description
22#: ../maas-region-controller.templates:1001
23msgid "Ubuntu MAAS Server"
24msgstr ""
25
26#. Type: note
27#. Description
28#: ../maas-region-controller.templates:1001
29msgid ""
30"The Ubuntu MAAS Server has been installed in your system. You can access the "
31"MAAS Web interface here:"
32msgstr ""
33
34#. Type: note
35#. Description
36#: ../maas-region-controller.templates:1001
37msgid " http://${MAAS_URL}/MAAS"
38msgstr ""
39
40#. Type: note
41#. Description
42#: ../maas-region-controller.templates:1001
43msgid ""
44"If the automatically detected address above is not in the same network as "
45"the MAAS clients, you need to reconfigure it:"
46msgstr ""
47
48#. Type: note
49#. Description
50#: ../maas-region-controller.templates:1001
51msgid " sudo dpkg-reconfigure maas-region-controller"
52msgstr ""
53
54#. Type: string20#. Type: string
55#. Description21#. Description
56#: ../maas-region-controller.templates:200122#: ../maas-region-controller.templates:1001
57msgid "Ubuntu MAAS PXE/Provisioning network address:"23msgid "Ubuntu MAAS PXE/Provisioning network address:"
58msgstr ""24msgstr ""
5925
60#. Type: string26#. Type: string
61#. Description27#. Description
62#: ../maas-region-controller.templates:200128#: ../maas-region-controller.templates:1001
63msgid ""29msgid ""
64"The Ubuntu MAAS Server automatically detects the IP address that is used for "30"The Ubuntu MAAS Server automatically detects the IP address that is used for "
65"PXE and provisioning. However, it needs to be in the same network as the "31"PXE and provisioning. However, it needs to be in the same network as the "
66"clients. If the automatically detected address is not in the same network as "32"clients. If the automatically detected address is not in the same network as "
67"the clients, it must be changed."33"the clients, it must be changed."
68msgstr ""34msgstr ""
35
36#. Type: string
37#. Description
38#: ../maas-region-controller.templates:2001
39msgid "Ubuntu MAAS username"
40msgstr ""
41
42#. Type: string
43#. Description
44#. Type: password
45#. Description
46#: ../maas-region-controller.templates:2001
47#: ../maas-region-controller.templates:3001
48msgid ""
49"The Ubuntu MAAS server requires the administrator to create a username and "
50"password combination."
51msgstr ""
52
53#. Type: string
54#. Description
55#: ../maas-region-controller.templates:2001
56msgid "Please provide the username for the MAAS account."
57msgstr ""
58
59#. Type: password
60#. Description
61#: ../maas-region-controller.templates:3001
62msgid "Ubuntu MAAS password"
63msgstr ""
64
65#. Type: password
66#. Description
67#: ../maas-region-controller.templates:3001
68msgid "Please provide the password for the MAAS account."
69msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: