Merge lp://qastaging/~aluria/charms/trusty/collectd/charm-collectd-allinone into lp://qastaging/~canonical-bootstack/charms/trusty/collectd/pre-layer
Proposed by
Alvaro Uria
| Status: | Merged |
|---|---|
| Merged at revision: | 27 |
| Proposed branch: | lp://qastaging/~aluria/charms/trusty/collectd/charm-collectd-allinone |
| Merge into: | lp://qastaging/~canonical-bootstack/charms/trusty/collectd/pre-layer |
| Diff against target: |
656 lines (+340/-80) 10 files modified
config.yaml (+0/-24) hooks/collectd_contexts.py (+94/-2) hooks/collectd_hooks.py (+32/-42) hooks/collectd_utils.py (+59/-2) templates/default.tmpl (+10/-0) templates/openstack.conf.tmpl (+62/-0) templates/write_http.conf.tmpl (+8/-0) unit_tests/test_collectd_contexts.py (+61/-4) unit_tests/test_collectd_hooks.py (+5/-4) unit_tests/test_collectd_utils.py (+9/-2) |
| To merge this branch: | bzr merge lp://qastaging/~aluria/charms/trusty/collectd/charm-collectd-allinone |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Legacy - Canonical WTFB | Pending | ||
|
Review via email:
|
|||
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
