Merge lp://qastaging/~patrick-hetu/charms/precise/python-django/python-rewrite into lp://qastaging/~charmers/charms/precise/python-django/trunk
Proposed by
Patrick Hetu
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 25 | ||||
| Proposed branch: | lp://qastaging/~patrick-hetu/charms/precise/python-django/python-rewrite | ||||
| Merge into: | lp://qastaging/~charmers/charms/precise/python-django/trunk | ||||
| Diff against target: |
3076 lines (+2334/-467) 27 files modified
.bzrignore (+5/-0) README.rst (+287/-35) TODO (+0/-25) config.yaml (+126/-85) copyright (+1/-1) fabfile.py (+197/-0) hooks/common.incl (+0/-13) hooks/config-changed (+0/-137) hooks/hooks.py (+854/-0) hooks/install (+0/-61) hooks/pgsql-relation-changed (+0/-51) hooks/upgrade-charm (+0/-11) hooks/website-relation-joined (+0/-14) hooks/wsgi-relation-joined (+0/-19) icon.svg (+395/-0) metadata.yaml (+17/-14) revision (+1/-1) templates/cache.tmpl (+10/-0) templates/cloudfiles.tmpl (+48/-0) templates/conf_injection.tmpl (+10/-0) templates/engine.tmpl (+19/-0) templates/mongodb_engine.tmpl (+8/-0) templates/netrc.tmpl (+10/-0) templates/secret.tmpl (+5/-0) templates/wsgi.py.tmpl (+12/-0) tests/01_deploy.test (+51/-0) tests/helpers.py (+278/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~patrick-hetu/charms/precise/python-django/python-rewrite | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mark Mims (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This is a huge merge, sorry for that...
I have postponed some work to later like:
* README spellproof: english is not my first language and Bruno is busy
* unused/shared code: I was thinking using charm-helpers in the future
To post a comment you must log in.
Revision history for this message
| Jorge Castro (jorge) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
When this lands I'd be more than happy to fix the README