Merge ~peter-sabaini/charm-juju-controller:readme-fix into charm-juju-controller:master

Proposed by Peter Sabaini
Status: Merged
Approved by: Peter Sabaini
Approved revision: 1fcfd2ee62a2e2bdf8ec499934d63b885a0ad3cd
Merged at revision: 49f86cbee157cfa3bc197d61a63c54539007b181
Proposed branch: ~peter-sabaini/charm-juju-controller:readme-fix
Merge into: charm-juju-controller:master
Diff against target: 22 lines (+2/-2)
1 file modified
src/ (+2/-2)
Reviewer Review Type Date Requested Status
Wouter van Bommel (community) Approve
BootStack Reviewers Pending
Review via email:

Commit message


To post a comment you must log in.

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

Wouter van Bommel (woutervb) wrote :


review: Approve

Change successfully merged at revision 49f86cbee157cfa3bc197d61a63c54539007b181

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/ b/src/
2index 7aff34d..5c838cb 100644
3--- a/src/
4+++ b/src/
5@@ -11,7 +11,7 @@ machines.
6 In order to monitor a controller on machine 0 in a model named 'controller':
8 juju switch controller
9- juju deploy cs:~xavpaice/juju-controller --to 0 juju-controller
10+ juju deploy cs:~llama-charmers/juju-controller --to 0 juju-controller
11 juju deploy cs:nrpe nrpe-controller
12 juju add-relation nrpe-controller juju-controller
13 juju config nrpe-controller nagios_host_context=mysitename
14@@ -27,7 +27,7 @@ You can alternately use this as a bundle, for example:
15 ```yaml
16 applications:
17 juju-controller:
18- charm: cs:~xavpaice/juju-controller
19+ charm: cs:~llama-charmers/juju-controller
20 num_units: 1
21 to:
22 - 0


People subscribed via source and target branches