Merge lp:~martin-hilton/charm-haproxy/alias-all_services-services into lp:charm-haproxy
Proposed by
Martin Hilton
Status: | Merged |
---|---|
Approved by: | Stuart Bishop |
Approved revision: | 118 |
Merged at revision: | 130 |
Proposed branch: | lp:~martin-hilton/charm-haproxy/alias-all_services-services |
Merge into: | lp:charm-haproxy |
Diff against target: |
157 lines (+67/-14) 4 files modified
Makefile (+1/-1) hooks/hooks.py (+17/-10) hooks/tests/test_install.py (+1/-2) hooks/tests/test_reverseproxy_hooks.py (+48/-1) |
To merge this branch: | bzr merge lp:~martin-hilton/charm-haproxy/alias-all_services-services |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stuart Bishop (community) | Approve | ||
Canonical IS Reviewers | Pending | ||
Review via email: mp+367560@code.launchpad.net |
Commit message
Update of lp:~evarlast/charm-haproxy/alias-all_services-services to make tests/lint pass.
Description of the change
This is the change originally proposed in https:/
To post a comment you must log in.
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.