Merge lp://staging/~bloodearnest/charm-haproxy/merge-trunk-snapstore into lp://staging/charm-haproxy
Proposed by
Simon Davy
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~bloodearnest/charm-haproxy/merge-trunk-snapstore |
| Merge into: | lp://staging/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://staging/~bloodearnest/charm-haproxy/merge-trunk-snapstore |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| haproxy-team | Pending | ||
|
Review via email:
|
|||
Commit message
Merge trunk for autocert support
To post a comment you must log in.
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
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.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.