Canonical SSO provider

Merge lp:~canonical-isd-hackers/canonical-identity-provider/jsonfield-fix into lp:canonical-identity-provider/release

  1. jsonfield-fix
  2. Merge into trunk
Proposed by David Owen
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: no longer in the source branch.
Merged at revision: 247
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/jsonfield-fix
Merge into: lp:canonical-identity-provider/release
Diff against target: 13 lines (+3/-0)
1 file modified
setup.py (+3/-0)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/jsonfield-fix
Reviewer Review Type Date Requested Status
Canonical ISD hackers Pending
Review via email: mp+86284@code.launchpad.net

Commit message

Pegged Gargoyle's django-jsonfield dep to something that actually works

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'setup.py'
--- setup.py 2011-10-04 16:28:29 +0000
+++ setup.py 2011-12-19 20:03:23 +0000
@@ -86,6 +86,9 @@
86 'python-memcached==1.44',86 'python-memcached==1.44',
87 'python-openid==2.2.4',87 'python-openid==2.2.4',
88 'django-piston',88 'django-piston',
89 # jsonfield is required by Gargoyle; not pegging it here
90 # causes bootstrap to fail:
91 'django-jsonfield<0.7',
89 'gargoyle',92 'gargoyle',
90 'pystatsd',93 'pystatsd',
91 ],94 ],