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

[Andres Rodriguez]

Prepare for 1.7.3 Release.

[MAAS Lander (maas-lander)]

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

[Andres Rodriguez (andreserl)]

review: Approve

=== 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 @@
-maas (1.7.3+bzr3355-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.7.3+bzr3361-0ubuntu1) UNRELEASED; urgency=medium
 
-  * UNRELEASED
+  * New upstream bugfix release, 1.7.3 bzr:
+    - Fix sorting by MAC address on node listing page (LP: #1437094)
+    - Automatically set correct boot resources and start re-import
+      so MAAS is usable after upgrade from 1.5. (LP: #1439359)
+    - Maintain backwards compatibility with MAAS 1.5 (custom) preseeds names
+      so users don't have to manually change preseed names. (LP: #1439366)
+    - Expose the version and the subversion of the running MAAS
+      on the API. (LP: #1441133)
+  - debian/patches/02-pserv-config.patch: Ensure pserv config file has a
+    default. This will also fix (LP: #1273197)
 
  -- Andres Rodriguez <[e-mail]>  Tue, 24 Mar 2015 15:56:10 -0400
 

=== 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 @@
  include port, logfile, oops directory, cobbler url and username
 Author: Andres Rodriguez <[e-mail]>
 
-Index: maas-1.7.2~rc1+bzr3350.orig/etc/maas/pserv.yaml
+Index: maas-1.7.3+bzr3359.orig/etc/maas/pserv.yaml
 ===================================================================
---- maas-1.7.2~rc1+bzr3350.orig.orig/etc/maas/pserv.yaml	2015-03-03 22:22:36.242296134 -0500
-+++ maas-1.7.2~rc1+bzr3350.orig/etc/maas/pserv.yaml	2015-03-03 22:22:36.242296134 -0500
+--- maas-1.7.3+bzr3359.orig.orig/etc/maas/pserv.yaml	2015-04-08 10:31:56.205881287 -0400
++++ maas-1.7.3+bzr3359.orig/etc/maas/pserv.yaml	2015-04-08 10:32:06.505881551 -0400
 @@ -6,7 +6,7 @@
  ## running server.
  #
@@ -16,7 +16,7 @@
  
  ## TFTP configuration.
  #
-@@ -18,8 +18,6 @@
+@@ -18,8 +18,7 @@
    # resource_root: /var/lib/maas/boot-resources/current/
  
    # port: 69
@@ -24,4 +24,5 @@
    ## The URL to be contacted to generate PXE configurations.
    # generator: http://localhost/MAAS/api/1.0/pxeconfig/
 -  generator: http://localhost:5243/api/1.0/pxeconfig/
++  generator: http://localhost/MAAS/api/1.0/pxeconfig/