MAAS

Merge lp:~julian-edwards/maas/fix-quantal-piston into lp:maas/trunk

  1. fix-quantal-piston
  2. Merge into trunk
Proposed by Julian Edwards on 2012-09-21
Status: Merged
Approved by: Julian Edwards on 2012-09-21
Approved revision: 1039
Merged at revision: 1040
Proposed branch: lp:~julian-edwards/maas/fix-quantal-piston
Merge into: lp:maas/trunk
Diff against target: 23 lines (+1/-1)
2 files modified
required-packages/base (+1/-0)
versions.cfg (+0/-1)
To merge this branch: bzr merge lp:~julian-edwards/maas/fix-quantal-piston
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) 2012-09-21 Approve on 2012-09-21
Review via email: mp+125638@code.launchpad.net

Commit Message

Unbreak quantal tests by using the packaged Piston instead of buildout's.

Piston 2.3.2 breaks with Django 1.4. Upstream has a fix but it is not released yet, so the quantal packaging carries a patch. We need to use the package to pick that up.

To post a comment you must log in.
Jeroen T. Vermeulen (jtv) wrote :

Timely. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'required-packages/base'
2--- required-packages/base 2012-09-18 17:10:46 +0000
3+++ required-packages/base 2012-09-21 06:52:22 +0000
4@@ -17,6 +17,7 @@
5 python-dbus
6 python-dev
7 python-django
8+python-django-piston
9 python-django-south
10 python-formencode
11 python-httplib2
12
13=== modified file 'versions.cfg'
14--- versions.cfg 2012-09-19 10:34:52 +0000
15+++ versions.cfg 2012-09-21 06:52:22 +0000
16@@ -22,7 +22,6 @@
17 convoy = 0.2.2
18 dbus = 1.0.0
19 django-picklefield = 0.1.9
20-django-piston = 0.2.3
21 FormEncode = 1.2.4
22 kombu = 1.4.3
23 lockfile = 0.8