Merge lp:~cjwatson/charms/trusty/turnip/direct-haproxy into lp:~canonical-launchpad-branches/charms/trusty/turnip/devel
Proposed by
Colin Watson
Status: | Merged |
---|---|
Merged at revision: | 62 |
Proposed branch: | lp:~cjwatson/charms/trusty/turnip/direct-haproxy |
Merge into: | lp:~canonical-launchpad-branches/charms/trusty/turnip/devel |
Diff against target: |
41 lines (+20/-3) 1 file modified
hooks/actions.py (+20/-3) |
To merge this branch: | bzr merge lp:~cjwatson/charms/trusty/turnip/direct-haproxy |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
William Grant | code | Approve | |
Review via email: mp+257417@code.launchpad.net |
Commit message
Expect to be proxied directly using haproxy, rather than via Apache; this entails setting up our service relations a little differently.
Description of the change
Expect to be proxied directly using haproxy, rather than via Apache; this entails setting up our service relations a little differently.
To post a comment you must log in.
The new service could do with a comment that it is because dodgy haproxy charm.