Merge lp:~andreserl/maas/packaging_bzr1269_quantal into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

0.1+bzr1269+dfsg-0ubuntu1
0.1+bzr1269+dfsg-0ubuntu2

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-16 15:01:38 +0000
+++ debian/changelog	2012-10-18 00:16:21 +0000
@@ -1,9 +1,29 @@
-maas (0.1+bzr1264+dfsg-0ubuntu3) UNRELEASED; urgency=low
+maas (0.1+bzr1269+dfsg-0ubuntu2) UNRELEASED; urgency=low
+
+  * UNRELEASED
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 17 Oct 2012 20:12:59 -0400
+
+maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low
+
+  * New upstream bugfix release
+    - Fixes commissioning failing to set memory attribute. (LP: #1064638)
+    - Fixes node listing by adding pagination (LP: #1064672)
+    - Changes default bind rndc key which breaks initscripts (LP: #1066938)
+    - Fixes invalid DNS config once node is enlisted (LP: #1066958)
+    - Reference documentation link to correct URL (LP: #1067261)
+
+  [ Andres Rodriguez ]
+  * debian/rules: Change upstream branch.
 
   [ Gavin Panella ]
   * debian/maas-dns.postinst: Remove MAAS-related include lines from named's
     config before adding a new one (LP: #1066929)
 
+  [ Raphael Badin ]
+  * debian/extras/maas-region-celeryd: Remove whitespace that affects DNS
+    rabbitmq queue. (LP: #1067929)
+
  -- Andres Rodriguez <[e-mail]>  Tue, 16 Oct 2012 10:31:37 -0400
 
 maas (0.1+bzr1264+dfsg-0ubuntu2) quantal; urgency=low

=== modified file 'debian/extras/maas-region-celeryd'
--- debian/extras/maas-region-celeryd	2012-10-16 14:30:48 +0000
+++ debian/extras/maas-region-celeryd	2012-10-18 00:16:21 +0000
@@ -15,7 +15,7 @@
         '--schedule=%s' % args.schedule,
         '--loglevel=INFO',
         '--beat',
-        '-Q celery,master',
+        '--queues=celery,master',
         ]
 
     # Change gid first, just in case changing the uid might deprive

=== modified file 'debian/rules'
--- debian/rules	2012-09-29 06:43:40 +0000
+++ debian/rules	2012-10-18 00:16:21 +0000
@@ -53,7 +53,7 @@
               | sed -rne 's,^Version: ([^-]+).*,\1,p')
 get-orig-source:
 	bzr export -r $(REV) --root=maas-$(VER).orig \
-             maas_$(VER).orig.tar.gz lp:maas
+             maas_$(VER).orig.tar.gz lp:maas/1.2
 	rm -rf maas-$(VER)
 	tar -xf maas_$(VER).orig.tar.gz
 	rm maas_$(VER).orig.tar.gz