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

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 360
Proposed branch: lp:~andreserl/maas/packaging_1.7.3
Merge into: lp:~maas-maintainers/maas/packaging.utopic
Diff against target: 53 lines (+16/-6)
2 files modified
debian/changelog (+11/-2)
debian/patches/02-pserv-config.patch (+5/-4)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_1.7.3
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+255521@code.launchpad.net

Commit message

Prepare for 1.7.3 Release.

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

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

Revision history for this message
Andres Rodriguez (andreserl) :
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 2015-03-24 19:56:39 +0000
+++ debian/changelog 2015-04-08 15:56:27 +0000
@@ -1,6 +1,15 @@
1maas (1.7.3+bzr3355-0ubuntu1) UNRELEASED; urgency=medium1maas (1.7.3+bzr3361-0ubuntu1) UNRELEASED; urgency=medium
22
3 * UNRELEASED3 * New upstream bugfix release, 1.7.3 bzr:
4 - Fix sorting by MAC address on node listing page (LP: #1437094)
5 - Automatically set correct boot resources and start re-import
6 so MAAS is usable after upgrade from 1.5. (LP: #1439359)
7 - Maintain backwards compatibility with MAAS 1.5 (custom) preseeds names
8 so users don't have to manually change preseed names. (LP: #1439366)
9 - Expose the version and the subversion of the running MAAS
10 on the API. (LP: #1441133)
11 - debian/patches/02-pserv-config.patch: Ensure pserv config file has a
12 default. This will also fix (LP: #1273197)
413
5 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 24 Mar 2015 15:56:10 -040014 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 24 Mar 2015 15:56:10 -0400
615
716
=== modified file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch 2015-03-04 03:43:56 +0000
+++ debian/patches/02-pserv-config.patch 2015-04-08 15:56:27 +0000
@@ -3,10 +3,10 @@
3 include port, logfile, oops directory, cobbler url and username3 include port, logfile, oops directory, cobbler url and username
4Author: Andres Rodriguez <andreserl@ubuntu.com>4Author: Andres Rodriguez <andreserl@ubuntu.com>
55
6Index: maas-1.7.2~rc1+bzr3350.orig/etc/maas/pserv.yaml6Index: maas-1.7.3+bzr3359.orig/etc/maas/pserv.yaml
7===================================================================7===================================================================
8--- maas-1.7.2~rc1+bzr3350.orig.orig/etc/maas/pserv.yaml 2015-03-03 22:22:36.242296134 -05008--- maas-1.7.3+bzr3359.orig.orig/etc/maas/pserv.yaml 2015-04-08 10:31:56.205881287 -0400
9+++ maas-1.7.2~rc1+bzr3350.orig/etc/maas/pserv.yaml 2015-03-03 22:22:36.242296134 -05009+++ maas-1.7.3+bzr3359.orig/etc/maas/pserv.yaml 2015-04-08 10:32:06.505881551 -0400
10@@ -6,7 +6,7 @@10@@ -6,7 +6,7 @@
11 ## running server.11 ## running server.
12 #12 #
@@ -16,7 +16,7 @@
16 16
17 ## TFTP configuration.17 ## TFTP configuration.
18 #18 #
19@@ -18,8 +18,6 @@19@@ -18,8 +18,7 @@
20 # resource_root: /var/lib/maas/boot-resources/current/20 # resource_root: /var/lib/maas/boot-resources/current/
21 21
22 # port: 6922 # port: 69
@@ -24,4 +24,5 @@
24 ## The URL to be contacted to generate PXE configurations.24 ## The URL to be contacted to generate PXE configurations.
25 # generator: http://localhost/MAAS/api/1.0/pxeconfig/25 # generator: http://localhost/MAAS/api/1.0/pxeconfig/
26- generator: http://localhost:5243/api/1.0/pxeconfig/26- generator: http://localhost:5243/api/1.0/pxeconfig/
27+ generator: http://localhost/MAAS/api/1.0/pxeconfig/
27 28

Subscribers

People subscribed via source and target branches

to all changes: