Merge lp:~cprov/charms/trusty/adt-cloud-service/gunicorn-app into lp:~canonical-ci-engineering/charms/trusty/adt-cloud-service/trunk
Proposed by
Celso Providelo
Status: | Merged |
---|---|
Approved by: | Celso Providelo |
Approved revision: | 8 |
Merged at revision: | 2 |
Proposed branch: | lp:~cprov/charms/trusty/adt-cloud-service/gunicorn-app |
Merge into: | lp:~canonical-ci-engineering/charms/trusty/adt-cloud-service/trunk |
Diff against target: |
272 lines (+83/-59) 8 files modified
README (+3/-2) adt.conf (+0/-17) config.yaml (+3/-4) hooks/actions.py (+63/-11) hooks/services.py (+5/-2) hooks/wsgi-relation-joined (+3/-0) metadata.yaml (+6/-2) templates/upstart.conf (+0/-21) |
To merge this branch: | bzr merge lp:~cprov/charms/trusty/adt-cloud-service/gunicorn-app |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Joe Talbott (community) | Approve | ||
Review via email: mp+252855@code.launchpad.net |
Commit message
Restoring upstart template capabilities and running web_app with gunicorn from the venv (py3 support).
Description of the change
Restoring upstart template capabilities and running web_app with gunicorn from the venv (py3 support).
Also providing website relation for HA | Apache
To post a comment you must log in.
LGTM, Thanks for doing this.