Merge lp:~bloodearnest/charm-haproxy/merge-trunk-snapstore into lp:charm-haproxy
Proposed by
Simon Davy
Status: | Superseded |
---|---|
Proposed branch: | lp:~bloodearnest/charm-haproxy/merge-trunk-snapstore |
Merge into: | lp:charm-haproxy |
Diff against target: |
59 lines (+20/-12) 2 files modified
files/nrpe/check_haproxy_queue_depth.sh (+2/-2) hooks/hooks.py (+18/-10) |
To merge this branch: | bzr merge lp:~bloodearnest/charm-haproxy/merge-trunk-snapstore |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
haproxy-team | Pending | ||
Review via email: mp+347843@code.launchpad.net |
Commit message
Merge trunk for autocert support
To post a comment you must log in.
Unmerged revisions
- 113. By Simon Davy
-
merge trunk r114, with updated charm-helpers and autocert support
- 112. By Thomi Richards
-
Bump haproxy stupidity.
- 111. By Thomi Richards
-
Merge fixes to haproxy service config handling.
- 110. By William Grant
-
Increase nagios haproxy queue depth thresholds until they're configurable.
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.