Merge lp:~andreserl/maas/packaging_1.8.1_prep into lp:~maas-maintainers/maas/packaging-1.8

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 413
Merged at revision: 413
Proposed branch: lp:~andreserl/maas/packaging_1.8.1_prep
Merge into: lp:~maas-maintainers/maas/packaging-1.8
Diff against target: 43 lines (+28/-2)
1 file modified
debian/changelog (+28/-2)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_1.8.1_prep
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+265907@code.launchpad.net

Commit message

Update changelog for 1.8.1 prep.

To post a comment you must log in.
413. By Andres Rodriguez

Update changelog

Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve
Revision history for this message
Christian Reis (kiko) wrote :

On Sun, Jul 26, 2015 at 01:12:27PM -0000, Andres Rodriguez wrote:
> +<<<<<<< TREE
> maas (1.8.1+bzr4019-0ubuntu2) UNRELEASED; urgency=medium
> +=======
> +maas (1.8.1+bzr4027-0ubuntu1) UNRELEASED; urgency=medium

Did you resolve the conflict?
--
Christian Robottom Reis | [+1] 612 888 4935 | http://launchpad.net/~kiko
Canonical VP Hyperscale | [+55 16] 9 9112 6430

Revision history for this message
Blake Rouse (blake-rouse) wrote :

Yes the conflict was resolved before this branch landed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2015-07-20 13:36:04 +0000
+++ debian/changelog 2015-07-26 13:14:17 +0000
@@ -1,4 +1,30 @@
1maas (1.8.1+bzr4019-0ubuntu2) UNRELEASED; urgency=medium1maas (1.8.1+bzr4027-0ubuntu1) UNRELEASED; urgency=medium
2
3 * New upstream release, 1.8.1 bzr4027:
4 - Fix upgrade issue where it would remove custom DNS config,
5 potentially breaking DNS (LP: #1413388)
6 - Commissioning x86_64 node never completes, sitting at grub
7 prompt, pserv py tbs (LP: #1317705)
8 - Power monitor service hits amp.TooLong errors with > ~600
9 nodes to a cluster (LP: #1389007)
10 - Websocket server accessed over port 5240 (LP: #1436279)
11 - If hostname not set, sudo warning make maas throw 500 (LP: #1469305)
12 - Can't set a list of forwarders (BIND config) (LP: #1470585)
13 - UCS chassis enlist Failed to probe and enlist UCS nodes: list
14 index out of range (LP: #1469846)
15 - Add cisco snic to 3rd party driver (LP: #1470276)
16 - console= parameters need to be added before -- on kernel
17 cmdline (LP: #1402042)
18 - [UI] Machine details styling (LP: #1465722)
19 - [UI] Actions design styles (LP: #1465737)
20 - [UI] Replace close "X" with correct versions (LP: #1465740)
21 - [UI] Table design styles (LP: #1465742)
22 - [UI] Make table heading hover consistant with nodes/devices
23 tabs (LP: #1470389)
24 - [UI] adding between node name and save button
25 inconsistent (LP: #1470395)
26 - [UI] "Set zone" label oddly placed on node listing
27 page (LP: #1459710)
228
3 [ Raphaël Badin ]29 [ Raphaël Badin ]
4 * Enable proxy_wstunnel module.30 * Enable proxy_wstunnel module.
@@ -17,7 +43,7 @@
17 * maas-proxy: sync apt specific squid config with squid-deb-proxy43 * maas-proxy: sync apt specific squid config with squid-deb-proxy
18 (LP: #1474417)44 (LP: #1474417)
1945
20 -- Scott Moser <smoser@ubuntu.com> Mon, 20 Jul 2015 09:32:08 -040046 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 06 Jul 2015 23:52:59 -0400
2147
22maas (1.8.0+bzr4001-0ubuntu1) trusty; urgency=medium48maas (1.8.0+bzr4001-0ubuntu1) trusty; urgency=medium
2349

Subscribers

People subscribed via source and target branches