← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~andreserl/maas/packaging_lp1236544 into lp:~maas-maintainers/maas/packaging

 

Andres Rodriguez has proposed merging lp:~andreserl/maas/packaging_lp1236544 into lp:~maas-maintainers/maas/packaging.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1236544 in MAAS: "canot access static images over http with apache 2.2 (precise)"
  https://bugs.launchpad.net/maas/+bug/1236544

For more details, see:
https://code.launchpad.net/~andreserl/maas/packaging_lp1236544/+merge/189694
-- 
https://code.launchpad.net/~andreserl/maas/packaging_lp1236544/+merge/189694
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/packaging_lp1236544 into lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/changelog'
--- debian/changelog	2013-10-04 16:33:18 +0000
+++ debian/changelog	2013-10-07 19:59:49 +0000
@@ -1,6 +1,7 @@
 maas (1.4+bzr1656+dfsg-0ubuntu3) UNRELEASED; urgency=low
 
-  * UNRELEASED
+  * d/maas-cluster-controller.postinst: a2enmod version module (LP: #1236544)
+  * d/control: Bump depends on python-django to 1.4.
 
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Fri, 04 Oct 2013 12:33:05 -0400
 

=== modified file 'debian/control'
--- debian/control	2013-10-04 16:32:55 +0000
+++ debian/control	2013-10-07 19:59:49 +0000
@@ -59,7 +59,7 @@
          maas-common (= ${binary:Version}),
          postgresql-9.1,
          pwgen,
-         python-django,
+         python-django (>= 1.4),
          python-django-maas (= ${binary:Version}),
          python-django-piston,
          python-django-south,

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2013-07-29 19:50:11 +0000
+++ debian/maas-cluster-controller.postinst	2013-10-07 19:59:49 +0000
@@ -70,6 +70,7 @@
 }
 
 configure_cluster_http(){
+    a2enmod version
     case $RELEASE in
         12.04|12.10|13.04)
             if [ -e /etc/maas/maas-cluster-http.conf -a \


Follow ups