Merge ~jacekn/charm-prometheus-alertmanager:master into ~prometheus-charmers/charm-prometheus-alertmanager:master
Proposed by
Jacek Nykis
| Status: | Merged |
|---|---|
| Approved by: | David Lawson |
| Approved revision: | d7f27d657f59206d87bc9d1f64a7eebe7ccc3526 |
| Merged at revision: | 20fc6ba3fc267b8ce1b6dc7d8ce112ccd6058c94 |
| Proposed branch: | ~jacekn/charm-prometheus-alertmanager:master |
| Merge into: | ~prometheus-charmers/charm-prometheus-alertmanager:master |
| Diff against target: |
234 lines (+101/-26) 8 files modified
hooks/alertmanager-cluster-relation-broken (+1/-0) hooks/alertmanager-cluster-relation-changed (+1/-0) hooks/alertmanager-cluster-relation-departed (+1/-0) hooks/alertmanager-cluster-relation-joined (+1/-0) hooks/defaulthook.py (+19/-0) metadata.yaml (+3/-0) reactive/alertmanager.py (+46/-11) templates/daemon_arguments.j2 (+29/-15) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Prometheus Charmers | Pending | ||
|
Review via email:
|
|||
Commit message
Add support for clustering. Switch to long config option format now that snap supports it.
To post a comment you must log in.
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
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.