Merge lp://qastaging/~brad-marshall/charms/trusty/nrpe-external-master/fix-rsyncd-conf into lp://qastaging/charms/nrpe-external-master
Proposed by
Brad Marshall
Status: | Merged |
---|---|
Approved by: | Brad Marshall |
Approved revision: | 38 |
Merged at revision: | 37 |
Proposed branch: | lp://qastaging/~brad-marshall/charms/trusty/nrpe-external-master/fix-rsyncd-conf |
Merge into: | lp://qastaging/charms/nrpe-external-master |
Diff against target: |
442 lines (+342/-35) 8 files modified
files/check_exit_status.pl (+189/-0) files/check_status_file.py (+60/-0) files/check_upstart_job (+72/-0) files/nagios_plugin.py (+0/-4) files/rsyncd.conf (+12/-0) hooks/config-changed (+2/-11) hooks/install (+7/-11) templates/rsyncd.conf.tmpl (+0/-9) |
To merge this branch: | bzr merge lp://qastaging/~brad-marshall/charms/trusty/nrpe-external-master/fix-rsyncd-conf |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Review Queue (community) | automated testing | Needs Fixing | |
JuanJo Ciarlante (community) | Approve | ||
Review via email: mp+241922@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2014-11-12.
Description of the change
Add support for a /etc/rsync-juju.d file, to allow charms to drop fragments in place. Required for the swift charm to have a working rsync.
To post a comment you must log in.
See inline comments, LGTM afterwards.