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

Proposed by Andres Rodriguez on 2014-04-15
Status: Merged
Approved by: Andres Rodriguez on 2014-04-15
Approved revision: 278
Merged at revision: 271
Proposed branch: lp:~andreserl/maas/release_bzr2252
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 50 lines (+21/-8)
2 files modified
debian/changelog (+20/-7)
debian/maas-region-controller.postinst (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/release_bzr2252
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2014-04-15
Review via email: mp+215937@code.launchpad.net

Commit message

Release 1.5+bzr2252-0ubuntu1
Open 1.5+bzr2252-0ubuntu2

To post a comment you must log in.
MAAS Lander (maas-lander) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Pending.

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 2014-04-11 03:35:57 +0000
+++ debian/changelog 2014-04-15 18:43:17 +0000
@@ -1,13 +1,26 @@
1maas (1.5+bzr2241-0ubuntu1) UNRELEASED; urgency=medium1maas (1.5+bzr2252-0ubuntu2) UNRELEASED; urgency=medium
22
3 [ Andres Rodriguez ]
4 * UNRELEASED3 * UNRELEASED
54
6 [ Julian Edwards ]5 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 15 Apr 2014 14:41:32 -0400
7 * debian/maas-region-controller-min.install: Ensure drivers.yaml is6
8 installed.7maas (1.5+bzr2252-0ubuntu1) trusty; urgency=medium
98
10 -- Julian Edwards <julian.edwards@canonical.com> Fri, 11 Apr 2014 13:34:47 +10009 * New upstream release
10 - Add support to install Third Party Drivers. In order for this to be
11 used the user will have to go to the Settings page to enable the
12 installation of these drivers. (LP: #1305839)
13 - Use release images instead of daily. (LP: #1306701)
14 - Quote interface name in dhcpd.template, otherwise DHCP server fails
15 to start. (LP: #1306335)
16 - Fix IntegrityError, when multiple processes are trying to register
17 the same component. (LP: #1307415)
18 - Add missing armhf commissioning template (LP: #1307780)
19 * debian/maas-region-controller-min.install: Install drivers.yaml.
20 * debian/maas-region-controller.postinst: No longer show the
21 installation note by default. (LP: #1284652)
22
23 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 09 Apr 2014 19:02:00 -0400
1124
12maas (1.5+bzr2236-0ubuntu1) trusty; urgency=medium25maas (1.5+bzr2236-0ubuntu1) trusty; urgency=medium
1326
1427
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst 2014-03-14 14:27:48 +0000
+++ debian/maas-region-controller.postinst 2014-04-15 18:43:17 +0000
@@ -240,7 +240,7 @@
240 fi240 fi
241241
242 # Display installation note242 # Display installation note
243 db_input high maas/installation-note || true243 db_input low maas/installation-note || true
244 db_go244 db_go
245245
246elif [ -n "$DEBCONF_RECONFIGURE" ]; then246elif [ -n "$DEBCONF_RECONFIGURE" ]; then

Subscribers

People subscribed via source and target branches

to all changes: