Merge lp://staging/~verterok/charms/trusty/telegraf/fix-haproxy-format into lp://staging/~ubuntuone-hackers/charms/trusty/telegraf/trunk
Proposed by
Guillermo Gonzalez
| Status: | Merged |
|---|---|
| Approved by: | Guillermo Gonzalez |
| Approved revision: | 19 |
| Merged at revision: | 19 |
| Proposed branch: | lp://staging/~verterok/charms/trusty/telegraf/fix-haproxy-format |
| Merge into: | lp://staging/~ubuntuone-hackers/charms/trusty/telegraf/trunk |
| Prerequisite: | lp://staging/~verterok/charms/trusty/telegraf/fix-influxdb-template |
| Diff against target: |
215 lines (+104/-26) 6 files modified
.bzrignore (+2/-0) README.md (+9/-10) config.yaml (+9/-10) hooks/actions.py (+29/-6) hooks/tests/__init__.py (+6/-0) hooks/tests/test_actions.py (+49/-0) |
| To merge this branch: | bzr merge lp://staging/~verterok/charms/trusty/telegraf/fix-haproxy-format |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Wes Mason (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix config rendering: extra_options is now valid YAML (without force string values) and add unittests
Description of the change
- fix config rendering: extra_options is now valid YAML (without force string values)
- added unittests for these changes
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
Seems legit
https:/