Merge lp:~timkuhlman/charms/trusty/grafana/grafana-update into lp:~canonical-is-sa/charms/trusty/grafana/grafana
Proposed by
Tim Kuhlman
Status: | Merged |
---|---|
Merged at revision: | 5 |
Proposed branch: | lp:~timkuhlman/charms/trusty/grafana/grafana-update |
Merge into: | lp:~canonical-is-sa/charms/trusty/grafana/grafana |
Diff against target: |
356 lines (+246/-3) 13 files modified
config.yaml (+6/-1) hooks/relations/http/README.md (+68/-0) hooks/relations/http/interface.yaml (+4/-0) hooks/relations/http/provides.py (+23/-0) hooks/relations/http/requires.py (+58/-0) hooks/website-relation-broken (+19/-0) hooks/website-relation-changed (+19/-0) hooks/website-relation-departed (+19/-0) hooks/website-relation-joined (+19/-0) layer.yaml (+1/-0) lib/charms/layer/basic.py (+2/-1) metadata.yaml (+2/-0) reactive/grafana.py (+6/-1) |
To merge this branch: | bzr merge lp:~timkuhlman/charms/trusty/grafana/grafana-update |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Kuhlman (community) | Approve | ||
Review via email: mp+293552@code.launchpad.net |
Description of the change
Charm Build of the latest layer changes, including revno 36.
To post a comment you must log in.
I'll merge this as it was pointed out that since the layer was approved and this is just the result of 'charm build' on that layer there isn't much to review.