Merge lp://qastaging/~doanac/uci-engine/restish-django into lp://qastaging/uci-engine
Proposed by
Andy Doan
Status: | Merged |
---|---|
Approved by: | Andy Doan |
Approved revision: | 669 |
Merged at revision: | 667 |
Proposed branch: | lp://qastaging/~doanac/uci-engine/restish-django |
Merge into: | lp://qastaging/uci-engine |
Diff against target: |
269 lines (+123/-22) 4 files modified
charms/precise/restish/config.yaml (+6/-1) charms/precise/restish/hooks/hooks.py (+71/-20) charms/precise/restish/metadata.yaml (+6/-0) charms/precise/restish/unit_tests/test_hooks.py (+40/-1) |
To merge this branch: | bzr merge lp://qastaging/~doanac/uci-engine/restish-django |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Celso Providelo (community) | Approve | ||
Review via email:
|
Commit message
restish charm: update it to support a django app
This adds the ability of the restish charm to support django as a
framework. This really makes this charm the "wsgi app" charm, but
we can do bzr renames another day
Description of the change
I was looking at fixing the django charm to match our new code layout when it hit me: Our restish charm can almost do this now and its MUCH MUCH MUCH cleaner and testable. This adds the missing pieces to the charm.
In the future we should just rename this charm something like "wsgi" since it handles multiple frameworks now.
To post a comment you must log in.
PASSED: Continuous integration, rev:668 s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/1050/
http://
Executed test runs:
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/1050/ rebuild
http://