Merge lp://qastaging/~brad-marshall/charms/trusty/nagios/fix-pagerduty-cron into lp://qastaging/charms/trusty/nagios
Proposed by
Brad Marshall
| Status: | Merged |
|---|---|
| Merged at revision: | 34 |
| Proposed branch: | lp://qastaging/~brad-marshall/charms/trusty/nagios/fix-pagerduty-cron |
| Merge into: | lp://qastaging/charms/trusty/nagios |
| Diff against target: |
29 lines (+8/-3) 2 files modified
hooks/templates/nagios-pagerduty-flush-cron.tmpl (+2/-1) hooks/upgrade-charm (+6/-2) |
| To merge this branch: | bzr merge lp://qastaging/~brad-marshall/charms/trusty/nagios/fix-pagerduty-cron |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stuart Bishop (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Added passing of the pagerduty queue dir to the cronjob.
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.