lp:~bloodearnest/charms/precise/python-django/trunk

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:charms/python-django

Cory Johns (community): Needs Fixing on 2015-02-24

Charles Butler (community): Needs Fixing on 2015-02-17

Tim Van Steenburgh (community): Needs Fixing on 2015-01-14

Review Queue (community): Needs Fixing (automated testing) on 2014-11-21

Patrick Hetu: Pending requested 2014-09-22

Diff: 71 lines (+21/-3)

3 files modified

hooks/charmhelpers/contrib/templating/contexts.py (+1/-1)
hooks/hooks.py (+18/-1)
templates/wsgi.py.tmpl (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

37. By Simon Davy on 2014-09-20

fix logic error

36. By Simon Davy on 2014-09-20

try and fix master/slave recognition

35. By Simon Davy on 2014-09-20

correct upgrade_charm

34. By Simon Davy on 2014-09-20

support adding pg units

33. By Simon Davy on 2014-09-20

ignore non-master posgresql units

32. By Simon Davy on 2014-09-19

add dj-static by default

31. By Simon Davy on 2014-09-16

fix charmhelpers bug

30. By Jorge Castro on 2014-09-08

[nuclearbob] Correct parameter for deploying from vcs.

29. By Charles Butler on 2014-05-12

Patrick Hetu 2014-05-02 fix a wrong configuration variable name
Patrick Hetu 2014-04-30 [merge] merge with trunk
Patrick Hetu 2014-04-30 add configurable amqp vhost
Patrick Hetu 2014-04-30 merge george-edison55's readme corrections
Patrick Hetu 2014-04-29 awk to the rescue: Re-enable http pip requirements support
Patrick Hetu 2014-04-28 drop http pip requirements as I can get it to work with ansible
Patrick Hetu 2014-04-25 add rabbitmq support
Patrick Hetu 2014-04-24 fix single python-path for fabfile.py
Patrick Hetu 2014-04-23 don't make python-path starts with a colon
Patrick Hetu 2014-04-17 add a new pip_extra_args option
Patrick Hetu 2014-04-17 fix settings path in the fabfile
Patrick Hetu 2014-04-17 forgot mirror urls in the playbook
Patrick Hetu 2014-04-17 release version 6
Patrick Hetu 2014-04-17 no need for |bool when checking variables
Patrick Hetu 2014-04-17 add the pip_freeze task in the fabfile
Patrick Hetu 2014-04-17 fix fabfile for latest version of juju-core
Patrick Hetu 2014-04-16 fix configuration reading for Django task
Patrick Hetu 2014-04-16 fix mercurial branch in playbook
Patrick Hetu 2014-04-16 merge changes from Ubuntu's ci-services and add my fixes
Patrick Hetu 2014-04-16 fix configuration injection for python3
Patrick Hetu 2014-04-16 fix mongodb settings
Patrick Hetu 2014-04-16 add redis support
Patrick Hetu 2014-04-16 fix ansible playbooks
Patrick Hetu 2014-04-16 add redis support
Patrick Hetu 2014-04-09 merge and adapt python-django_ci-services branch
Patrick Hetu 2013-11-26 FIX 1226303 : Minor formatting problem in README's markdown
Patrick Hetu 2013-11-26 python3 compatiblity
Patrick Hetu 2013-11-26 use ansible for handling repos and pip
Patrick Hetu 2013-11-18 wsgi configurations that works for gunicorn and uwsgi
Patrick Hetu 2013-11-17 convert the code to use charmhelpers
Patrick Hetu 2013-09-03 mysql don't support autocommit yet
Patrick Hetu 2013-08-07 increment version number
Patrick Hetu 2013-08-07 puts pip's source in a safe place and accept remote requirements files
Patrick Hetu 2013-08-05 add support for a mysql server relation

28. By <email address hidden> on 2014-04-28

[george-edison55] The README contained a few minor typographical errors and a couple of Markdown errors. This branch fixes both of these.