Merge lp://staging/~thedac/charms/precise/daisy-retracer/fix-restart-script into lp://staging/~daisy-pluckers/charms/precise/daisy-retracer/trunk
Proposed by
David Ames
| Status: | Merged |
|---|---|
| Merged at revision: | 52 |
| Proposed branch: | lp://staging/~thedac/charms/precise/daisy-retracer/fix-restart-script |
| Merge into: | lp://staging/~daisy-pluckers/charms/precise/daisy-retracer/trunk |
| Diff against target: |
57 lines (+5/-6) 3 files modified
config.yaml (+1/-1) hooks/common (+1/-0) templates/retracers-cache-restart.sh.tmpl (+3/-5) |
| To merge this branch: | bzr merge lp://staging/~thedac/charms/precise/daisy-retracer/fix-restart-script |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daisy Pluckers | Pending | ||
|
Review via email:
|
|||
Description of the change
Set the upstart kill timeout to give the code a chance to clean up after itself
Fix retracer-
Remove references to supervisor
Default the mailto to root so the cron will run if mailto is not set
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
