Ubuntu Developer Portal

Merge lp://staging/~dholbach/developer-ubuntu-com/django-cms-update into lp://staging/developer-ubuntu-com

django-cms-update
Merge into stable

Proposed by Daniel Holbach on 2015-11-24

Status:	Superseded
Proposed branch:	lp://staging/~dholbach/developer-ubuntu-com/django-cms-update
Merge into:	lp://staging/developer-ubuntu-com
Diff against target:	375 lines (+143/-25) (has conflicts) 6 files modified Makefile (+16/-3) developer_portal/blog/views.py (+15/-5) developer_portal/management/commands/initdb.py (+29/-17) developer_portal/settings.py (+26/-0) pip-cache-revno.txt (+4/-0) requirements.txt (+53/-0) Text conflict in Makefile Text conflict in developer_portal/management/commands/initdb.py Text conflict in developer_portal/settings.py Text conflict in pip-cache-revno.txt Text conflict in requirements.txt
To merge this branch:	bzr merge lp://staging/~dholbach/developer-ubuntu-com/django-cms-update
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ubuntu App Developer site developers		2015-11-24	Pending
Review via email: mp+278447@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2016-01-06.

lp://staging/~dholbach/developer-ubuntu-com/django-cms-update updated on 2015-12-15

151. By David Callé on 2015-11-25: Merge trunk
152. By David Callé on 2015-11-27: Merge various updates
153. By David Callé on 2015-11-27: Alternate deps branch
154. By David Callé on 2015-11-27: Remove swift_proxy references
155. By David Callé on 2015-11-27: revert collectstatic change, seems to hang on staging
156. By David Callé on 2015-11-27: revert collectstatic change, seems to hang on staging
157. By David Callé on 2015-12-03: Allow iframes in ckeditor
158. By David Callé on 2015-12-04: Adapt for new staging deps branch
159. By David Callé on 2015-12-11: Revert to one pip branch
160. By David Callé on 2015-12-11: Fix wrong bzr commands for pip-cache, my bad
161. By David Callé on 2015-12-11: Bump pip-cache revno
162. By David Callé on 2015-12-11: Blog archives fix (dholbach)
163. By David Callé on 2015-12-11: Bug #1525202: initdb could add an 'English' and 'Chinese' category for blog posts
164. By David Callé on 2015-12-15: Update deps and migrations
165. By David Callé on 2015-12-15: Update pip cache revno

Revision history for this message

Daniel Holbach (dholbach) wrote on 2016-01-06:

Packages which are not updated in this newest revision:

Pillow (Current: 2.9.0 Latest: 3.1.0)
- does not build.

django-reversion (Current: 1.9.3 Latest: 1.10.0)
- crash in cms(?)

argparse (Current: 1.2.1 Latest: 1.4.0)
pip (Current: 1.5.6 Latest: 7.1.2)
Django-Select2 (Current: 4.3.2 Latest: 5.5.0)
django-treebeard (Current: 3.0 Latest: 4.0)
- used internally

python-swiftclient (Current: 2.6.0 Latest: 2.7.0)
oslo.utils (Current: 2.8.0 Latest: 3.3.0)
oslo.serialization (Current: 1.11.0 Latest: 2.2.0)
oslo.config (Current: 2.7.0 Latest: 3.2.0)
python-keystoneclient (Current: 1.3.3 Latest: 2.0.0)
oslo.i18n (Current: 2.7.0 Latest: 3.1.0)
- unsure about these...

Django (Current: 1.8.8 Latest: 1.9.1)
- some modules don't work with 1.9 yet

lp://staging/~dholbach/developer-ubuntu-com/django-cms-update updated on 2016-01-06