Merge lp:~andreserl/maas/pkg_beta8_release into lp:~maas-maintainers/maas/packaging.utopic

Proposed by Andres Rodriguez
Status: Merged
Merged at revision: 332
Proposed branch: lp:~andreserl/maas/pkg_beta8_release
Merge into: lp:~maas-maintainers/maas/packaging.utopic
Diff against target: 36 lines (+13/-3)
2 files modified
debian/changelog (+12/-2)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/pkg_beta8_release
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Christian Reis (community) Approve
Review via email: mp+239332@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Reis (kiko) wrote :

+1 from me.

review: Approve
Revision history for this message
Julian Edwards (julian-edwards) wrote :

There's no lander for this branch so manually merge.

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 2014-10-21 15:21:56 +0000
3+++ debian/changelog 2014-10-23 00:24:43 +0000
4@@ -1,10 +1,20 @@
5-maas (1.7.0~beta7+bzr3267-0ubuntu2) utopic; urgency=medium
6+maas (1.7.0~beta8+bzr3272-0ubuntu1) UNRELEASED; urgency=medium
7+
8+ * New Upstream Release, Beta 8 bzr 3272.
9+ - Maintain backward compatibility with status codes to not break
10+ client MAAS API users. (LP: #1383609)
11+ - Allow users to disable DHCP NIC scanning during commissioning otherwise
12+ this can lead machines not being able to commission (LP: #1383384)
13+ - Ensure that MAAS can correctly download, and install HWE Kernels, and
14+ not crash in the process. (LP: #1357532, LP: #1382281)
15+ - Add a lock to ensure we don't give the same 2 systems to two different
16+ users when acquiring a machine. (LP: #1382575)
17
18 [ Michael McCracken ]
19 * debian/maas-dns.postrm: ensure named.conf is cleaned of maas
20 includes (LP: #1346538)
21
22- -- Michael McCracken <mike.mccracken@canonical.com> Mon, 20 Oct 2014 15:32:22 -0700
23+ -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 22 Oct 2014 12:55:08 -0400
24
25 maas (1.7.0~beta7+bzr3266-0ubuntu1) utopic; urgency=medium
26
27
28=== modified file 'debian/rules'
29--- debian/rules 2014-10-14 07:03:50 +0000
30+++ debian/rules 2014-10-23 00:24:43 +0000
31@@ -52,4 +52,4 @@
32 | sed -rne 's,^Version: ([^-]+).*,\1,p')
33 get-orig-source:
34 bzr export -r $(REV) --root=maas-$(VER).orig \
35- maas_$(VER).orig.tar.gz lp:maas
36+ maas_$(VER).orig.tar.gz lp:maas/1.7

Subscribers

People subscribed via source and target branches

to all changes: