Merge lp://qastaging/~brad-marshall/charms/trusty/ntp/remove-ntp-status-check into lp://qastaging/charms/trusty/ntp
Proposed by
Brad Marshall
| Status: | Merged |
|---|---|
| Merged at revision: | 22 |
| Proposed branch: | lp://qastaging/~brad-marshall/charms/trusty/ntp/remove-ntp-status-check |
| Merge into: | lp://qastaging/charms/trusty/ntp |
| Diff against target: |
184 lines (+0/-162) 2 files modified
files/nagios/check_ntpd.pl (+0/-154) hooks/ntp_hooks.py (+0/-8) |
| To merge this branch: | bzr merge lp://qastaging/~brad-marshall/charms/trusty/ntp/remove-ntp-status-check |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Ceppi (community) | Approve | ||
| Paul Gear (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
The check ntp status check is now superseded by ntpmon, no longer needed.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good to me; check_ntpmon.py is designed to handle all of the checks that check_ntpd.pl provides, plus others.