Merge lp://staging/~verterok/charms/trusty/telegraf/config-order into lp://staging/~ubuntuone-hackers/charms/trusty/telegraf/trunk
Proposed by
Guillermo Gonzalez
| Status: | Merged |
|---|---|
| Approved by: | Guillermo Gonzalez |
| Approved revision: | 26 |
| Merged at revision: | 21 |
| Proposed branch: | lp://staging/~verterok/charms/trusty/telegraf/config-order |
| Merge into: | lp://staging/~ubuntuone-hackers/charms/trusty/telegraf/trunk |
| Prerequisite: | lp://staging/~verterok/charms/trusty/telegraf/memcached-support |
| Diff against target: |
62 lines (+13/-7) 3 files modified
hooks/actions.py (+6/-3) hooks/tests/test_actions.py (+1/-1) templates/base_inputs.conf (+6/-3) |
| To merge this branch: | bzr merge lp://staging/~verterok/charms/trusty/telegraf/config-order |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Guillermo Gonzalez | Approve | ||
|
Review via email:
|
|||
Commit message
Change the templates to put the tagpass|drop section at the end.
Description of the change
telegraf is picky about the order of the config and tagpass|drop sections, this branch change the templates to put the tagpass|drop section at the end.
To post a comment you must log in.
Revision history for this message
| Guillermo Gonzalez (verterok) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
