Merge ~tcuthbert/charm-nagios:master into ~nagios-charmers/charm-nagios:master

Proposed by Thomas Cuthbert
Status: Merged
Approved by: Junien F
Approved revision: 2f1d2b5bd46463a35cf8f13678e6ba7467337201
Merged at revision: 0ebcbda229a68b271c8c4c0b2be4e66bd8ec685c
Proposed branch: ~tcuthbert/charm-nagios:master
Merge into: ~nagios-charmers/charm-nagios:master
Diff against target: 21 lines (+2/-2)
1 file modified
README.md (+2/-2)
Reviewer Review Type Date Requested Status
Junien F Approve
Canonical IS Reviewers Pending
Review via email: mp+369932@code.launchpad.net

Commit message

Fix broken link in charm doco, LP#1836008

To post a comment you must log in.
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
Junien F (axino) wrote :

+1

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

Change successfully merged at revision 0ebcbda229a68b271c8c4c0b2be4e66bd8ec685c

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index ebc9f0c..a71ef83 100644
3--- a/README.md
4+++ b/README.md
5@@ -2,7 +2,7 @@
6
7 [Nagios](http://nagios.org) offers complete monitoring and alerting for servers, switches, applications, and services.
8
9-This charm is designed to do basic monitoring of any service in the Charm Store that relates to it. There is an [NRPE subordinate charm](https://jujucharms.com/precise/nrpe/) that you can use if you want to use local monitors.
10+This charm is designed to do basic monitoring of any service in the Charm Store that relates to it. There is an [NRPE subordinate charm](https://jujucharms.com/nrpe/) that you can use if you want to use local monitors.
11
12 # Usage
13
14@@ -17,7 +17,7 @@ This charm is designed to be used with other charms. In order to monitor anythin
15
16 This should result in your Nagios monitoring all of the service units.
17
18-There is an [NRPE subordinate charm](https://jujucharms.com/precise/nrpe/) which must be used for any local monitors. See the `nrpe` charm's README for information on how to make use of it.
19+There is an [NRPE subordinate charm](https://jujucharms.com/nrpe/) which must be used for any local monitors. See the `nrpe` charm's README for information on how to make use of it.
20
21 You can expose the service and browse to `http://x.x.x.x/nagios3` to get to the web UI, following the example:
22

Subscribers

People subscribed via source and target branches