Merge ~cjohnston/charm-prometheus-alertmanager:lp1891101 into charm-prometheus-alertmanager:master

Proposed by Chris Johnston
Status: Merged
Approved by: James Troup
Approved revision: 5f7ebe445aa96006c048acb676c287e4b7cc4294
Merged at revision: 5da5970711164ca7bcb6982093b289051db783dd
Proposed branch: ~cjohnston/charm-prometheus-alertmanager:lp1891101
Merge into: charm-prometheus-alertmanager:master
Diff against target: 30 lines (+4/-4)
1 file modified
src/README.md (+4/-4)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
BootStack Reviewers Pending
Review via email: mp+415469@code.launchpad.net

Commit message

Cleanup readme.

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 5da5970711164ca7bcb6982093b289051db783dd

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/README.md b/src/README.md
index d1c1759..ba2628b 100644
--- a/src/README.md
+++ b/src/README.md
@@ -1,8 +1,8 @@
1# Juju prometheus alertmanager charm1# Juju prometheus alertmanager charm
22
3This charm provides the [Prometheus alertmanager](https://github.com/prometheus/alertmanager), part of the [Prometheus](https://prometheus.io/) monitoring system3This charm provides the [Prometheus alertmanager](https://github.com/prometheus/alertmanager), part of the [Prometheus](https://prometheus.io/) monitoring system.
44
5The charm should be realted to the prometheus charm5The charm should be related to the prometheus charm.
66
7## Configuration7## Configuration
88
@@ -11,7 +11,7 @@ Common configuration options are:
11 * external_url11 * external_url
12 * repeat_interval12 * repeat_interval
1313
14The charm supports many differnet notification mechanisms. For example14The charm supports many different notification mechanisms. For example,
15to enable email notifications set the following options:15to enable email notifications set the following options:
1616
17 * smtp_smarthost17 * smtp_smarthost
@@ -23,4 +23,4 @@ To send notifications to PagerDuty set:
23 * pagerduty_service_key23 * pagerduty_service_key
2424
25For more information about supported notification methods and other25For more information about supported notification methods and other
26configuration options refer to the config.yaml help26configuration options refer to the config.yaml help.

Subscribers

People subscribed via source and target branches

to all changes: