NRPE Charm

Merge ~pjdc/charm-nrpe/+git/nrpe-charm:separate-external-nagios-lock into ~nrpe-charmers/charm-nrpe:master

  1. Git
  2. lp:~pjdc/charm-nrpe/+git/nrpe-charm
  3. separate-external-nagios-lock
  4. Merge into master
Proposed by Paul Collins
Status: Merged
Approved by: Tom Haddon
Approved revision: 4cda7010d587a64fdb78def473ef19fcf78288ce
Merged at revision: ccbc86ded67c8f33145efdf39d06c3b8279d92a2
Proposed branch: ~pjdc/charm-nrpe/+git/nrpe-charm:separate-external-nagios-lock
Merge into: ~nrpe-charmers/charm-nrpe:master
Diff against target: 10 lines (+1/-0)
1 file modified
templates/rsync-juju.d.tmpl (+1/-0)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Haw Loeung +1 Approve
NRPE charm developers Pending
Review via email: mp+389052@code.launchpad.net

Commit message

use separate lock file for external-nagios

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
Haw Loeung (hloeung) wrote :

LGTM

review: Approve (+1)
Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

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

Change successfully merged at revision ccbc86ded67c8f33145efdf39d06c3b8279d92a2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/rsync-juju.d.tmpl b/templates/rsync-juju.d.tmpl
2index 5fdf9b3..a625958 100644
3--- a/templates/rsync-juju.d.tmpl
4+++ b/templates/rsync-juju.d.tmpl
5@@ -7,4 +7,5 @@
6 comment = External Nagios Node configs
7 list = false
8 read only = true
9+ lock file = /var/run/rsyncd.external-nagios.lock
10 hosts allow = {{ external_nagios_master }}

Subscribers

People subscribed via source and target branches