Merge lp://staging/~jjo/charms/trusty/prometheus/use-bootstack-ppa-and-other-fixes into lp://staging/~canonical-bootstack/charms/trusty/prometheus/pre-layer
Proposed by
JuanJo Ciarlante
Status: | Merged |
---|---|
Merged at revision: | 38 |
Proposed branch: | lp://staging/~jjo/charms/trusty/prometheus/use-bootstack-ppa-and-other-fixes |
Merge into: | lp://staging/~canonical-bootstack/charms/trusty/prometheus/pre-layer |
Diff against target: |
117 lines (+20/-13) 6 files modified
config.yaml (+1/-1) hooks/prometheus_hooks.py (+9/-3) hooks/prometheus_utils.py (+1/-1) metadata.yaml (+3/-0) tests/00-setup (+2/-3) unit_tests/test_prometheus_hooks.py (+4/-5) |
To merge this branch: | bzr merge lp://staging/~jjo/charms/trusty/prometheus/use-bootstack-ppa-and-other-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alvaro Uria (community) | Approve | ||
Review via email:
|
Commit message
[jjo, r=] use ppa:bootstack-
- new install_pachages() function
- add install_packages() function, called also at config_changed time to support eg changed ppa
- add nrpe-external-
To post a comment you must log in.
lgtm