NRPE Charm

Merge ~pjdc/charm-nrpe/+git/nrpe-charm:rsync-merge-config into ~nrpe-charmers/charm-nrpe:master

  1. Git
  2. lp:~pjdc/charm-nrpe/+git/nrpe-charm
  3. rsync-merge-config
  4. Merge into master
Proposed by Paul Collins
Status: Merged
Approved by: Paul Collins
Approved revision: 3d2dddcc9160b1ece49df6fa3c2d931b8cfd014f
Merged at revision: d4b8d2c7aab412a57bf348650b132b83650673f4
Proposed branch: ~pjdc/charm-nrpe/+git/nrpe-charm:rsync-merge-config
Merge into: ~nrpe-charmers/charm-nrpe:master
Diff against target: 10 lines (+1/-0)
1 file modified
files/rsyncd.conf (+1/-0)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Canonical IS Reviewers Pending
Review via email: mp+388856@code.staging.launchpad.net

Commit message

allow direct includes from /etc/rsync-juju.d

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
Tom Haddon (mthaddon) wrote :

LGTM, thx

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

Change successfully merged at revision d4b8d2c7aab412a57bf348650b132b83650673f4

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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches