Merge lp://staging/~aglenyoung/charms/precise/haproxy/haproxy-stats-socket into lp://staging/charms/haproxy
Proposed by
Andrew Glen-Young
| Status: | Merged |
|---|---|
| Merged at revision: | 83 |
| Proposed branch: | lp://staging/~aglenyoung/charms/precise/haproxy/haproxy-stats-socket |
| Merge into: | lp://staging/charms/haproxy |
| Prerequisite: | lp://staging/~aglenyoung/charms/precise/haproxy/haproxy-fix-tests |
| Diff against target: |
60 lines (+12/-0) 3 files modified
config.yaml (+5/-0) hooks/hooks.py (+3/-0) hooks/tests/test_helpers.py (+4/-0) |
| To merge this branch: | bzr merge lp://staging/~aglenyoung/charms/precise/haproxy/haproxy-stats-socket |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Van Steenburgh (community) | Approve | ||
| Marco Ceppi | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2014-01-15.
To post a comment you must log in.
Revision history for this message
| Andrew Glen-Young (aglenyoung) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi Andrew, thanks for taking the time to add this option! Unfortunately your changes do not pass the haproxy unit test.
You can verify this by running `make build` in the charm's root. Please update the tests to reflect your changes.
Barring the tests passing, this LGTM. However, because of the test fails I have to decline this merge. Once you've addressed this issue please select "Request another review" and enter "charmers". This will place your update back in our charm review queue so we can re-review it again.