Merge lp://staging/~gnuoy/charms/trusty/nrpe/services-rewrite into lp://staging/charms/trusty/nrpe
Proposed by
Liam Young
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 36 | ||||
Proposed branch: | lp://staging/~gnuoy/charms/trusty/nrpe/services-rewrite | ||||
Merge into: | lp://staging/charms/trusty/nrpe | ||||
Diff against target: |
7281 lines (+5917/-888) 76 files modified
.bzrignore (+0/-1) .coveragerc (+6/-0) Makefile (+28/-0) README (+0/-11) README.md (+183/-0) base-monitors.yaml (+0/-9) bin/charm_helpers_sync.py (+253/-0) charm-helpers-hooks.yaml (+5/-0) charm-helpers-tests.yaml (+4/-0) config.yaml (+85/-5) copyright (+19/-3) files/default_rsync (+7/-0) files/nagios_plugin.py (+72/-0) files/plugins/check_exit_status.pl (+189/-0) files/plugins/check_mem.pl (+266/-0) files/plugins/check_netns.sh (+35/-0) files/plugins/check_status_file.py (+54/-0) files/plugins/check_upstart_job (+72/-0) files/rsyncd.conf (+12/-0) hooks/charmhelpers/__init__.py (+38/-0) hooks/charmhelpers/core/__init__.py (+15/-0) hooks/charmhelpers/core/decorators.py (+57/-0) hooks/charmhelpers/core/fstab.py (+134/-0) hooks/charmhelpers/core/hookenv.py (+594/-0) hooks/charmhelpers/core/host.py (+450/-0) hooks/charmhelpers/core/services/__init__.py (+18/-0) hooks/charmhelpers/core/services/base.py (+329/-0) hooks/charmhelpers/core/services/helpers.py (+267/-0) hooks/charmhelpers/core/strutils.py (+42/-0) hooks/charmhelpers/core/sysctl.py (+56/-0) hooks/charmhelpers/core/templating.py (+68/-0) hooks/charmhelpers/core/unitdata.py (+477/-0) hooks/charmhelpers/fetch/__init__.py (+439/-0) hooks/charmhelpers/fetch/archiveurl.py (+161/-0) hooks/charmhelpers/fetch/bzrurl.py (+78/-0) hooks/charmhelpers/fetch/giturl.py (+71/-0) hooks/config-changed (+0/-99) hooks/general-info-relation-changed (+0/-12) hooks/install (+0/-12) hooks/local-monitors-relation-changed (+0/-30) hooks/local-monitors-relation-departed (+0/-4) hooks/monitors-relation-joined (+0/-17) hooks/nrpe-relation-broken (+0/-5) hooks/nrpe-relation-departed (+0/-7) hooks/nrpe-relation-joined (+0/-23) hooks/nrpe.common.bash (+0/-28) hooks/nrpe_helpers.py (+277/-0) hooks/nrpe_hooks.py (+3/-0) hooks/nrpe_utils.py (+125/-0) hooks/recursive_dictionary.py (+0/-63) hooks/services.py (+64/-0) hooks/start (+0/-4) hooks/stop (+0/-3) hooks/upgrade-charm (+0/-5) lib/net.sh (+0/-188) metadata.yaml (+10/-5) plugins/check_mem.pl (+0/-266) revision (+0/-1) templates/export_host.cfg.tmpl (+10/-0) templates/nrpe.tmpl (+16/-0) templates/nrpe_command.tmpl (+3/-0) templates/rsync-juju.d.tmpl (+10/-0) test-mon.yaml (+24/-0) test-monitors.yaml (+0/-15) tests/00-setup (+3/-12) tests/10-bundles-test.py (+0/-33) tests/10-tests (+305/-0) tests/11-monitors-configurations (+3/-1) tests/13-monitors-config (+3/-1) tests/bundles.yaml (+0/-25) tests/charmhelpers/__init__.py (+38/-0) tests/charmhelpers/contrib/__init__.py (+15/-0) tests/charmhelpers/contrib/amulet/__init__.py (+15/-0) tests/charmhelpers/contrib/amulet/deployment.py (+93/-0) tests/charmhelpers/contrib/amulet/utils.py (+314/-0) tests/tests.yaml (+2/-0) |
||||
To merge this branch: | bzr merge lp://staging/~gnuoy/charms/trusty/nrpe/services-rewrite | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Ceppi (community) | Approve | ||
Adam Israel (community) | Approve | ||
Review via email: mp+253799@code.staging.launchpad.net |
To post a comment you must log in.
I have an issue with the copyright file changes. The glob (*) covers everything but there are files in files/plugins that are not under the Canonical copyright. Relaying those copyrights up into that file would make me feel better. Otherwise this LGTM