Merge lp:~julian-edwards/maas/packaging-1.6.0 into lp:~maas-maintainers/maas/packaging.trusty

Proposed by Julian Edwards on 2014-08-19
Status: Merged
Approved by: Julian Edwards on 2014-08-19
Approved revision: 289
Merged at revision: 289
Proposed branch: lp:~julian-edwards/maas/packaging-1.6.0
Merge into: lp:~maas-maintainers/maas/packaging.trusty
Diff against target: 61 lines (+11/-13)
3 files modified
debian/changelog (+7/-10)
debian/maas-cluster-controller.install (+0/-1)
debian/maas-region-controller.postinst (+4/-2)
To merge this branch: bzr merge lp:~julian-edwards/maas/packaging-1.6.0
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve on 2014-08-19
Review via email: mp+231286@code.launchpad.net

Commit message

Packaging release for 1.6.0

To post a comment you must log in.
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-08-11 00:00:58 +0000
3+++ debian/changelog 2014-08-19 03:02:00 +0000
4@@ -1,13 +1,6 @@
5-maas (1.5.4+bzr2294-0ubuntu1) trusty; urgency=medium
6+maas (1.6.0+bzr2545-0ubuntu1~ppa1) trusty; urgency=medium
7
8- * New upstream bug fix release:
9- - Package fails to install when the default route is through an
10- aliased/tagged interface (LP: #1350235)
11- - ERROR Nonce already used (LP: #1190986)
12- - Add MAAS arm64/xgene support (LP: #1338851)
13- - Add utopic support (LP: #1337437)
14- - API documentation for nodegroup op=details missing parameter
15- (LP: #1331982)
16+ * New upstream release 1.6.0
17
18 [ Greg Lutostanski ]
19 * debian/control:
20@@ -25,7 +18,11 @@
21 * debian/control:
22 - python-maas-provisioningserver depends on python-paramiko (LP: #1334401)
23
24- -- Julian Edwards <julian.edwards@canonical.com> Wed, 30 Jul 2014 17:32:00 +0100
25+ [ Julian Edwards ]
26+ * debian/maas-cluster-controller.install: don't install bootresources.yaml
27+ any more, it's not there in 1.6.0
28+
29+ -- Julian Edwards <julian.edwards@canonical.com> Tue, 19 Aug 2014 12:56:37 +1000
30
31 maas (1.5.3+bzr2287-0ubuntu1) trusty; urgency=medium
32
33
34=== modified file 'debian/maas-cluster-controller.install'
35--- debian/maas-cluster-controller.install 2014-03-28 18:32:24 +0000
36+++ debian/maas-cluster-controller.install 2014-08-19 03:02:00 +0000
37@@ -3,7 +3,6 @@
38
39 # Install PSERV config files
40 debian/tmp/etc/maas/pserv.yaml
41-debian/tmp/etc/maas/bootresources.yaml
42
43 # Install cluster config file
44 debian/tmp/etc/maas/maas_cluster.conf
45
46=== modified file 'debian/maas-region-controller.postinst'
47--- debian/maas-region-controller.postinst 2014-04-11 13:20:01 +0000
48+++ debian/maas-region-controller.postinst 2014-08-19 03:02:00 +0000
49@@ -219,8 +219,10 @@
50 ########## Configure worker rabbitmq config ###########
51 #########################################################
52
53- # Handle celery/rabbitmq publishing
54- configure_maas_workers_rabbitmq_user "$ipaddr"
55+ if dpkg --compare-versions "$2" lt 1.5+bzr2252-0ubuntu1; then
56+ # Handle celery/rabbitmq publishing
57+ configure_maas_workers_rabbitmq_user "$ipaddr"
58+ fi
59
60 #########################################################
61 ################ Configure Database ###################

Subscribers

People subscribed via source and target branches

to all changes: