Merge lp:~michael.nelson/charms/trusty/kibana/trunk into lp:~canonical-is-sa/charms/trusty/kibana/trunk
Proposed by
Michael Nelson
Status: | Merged |
---|---|
Merged at revision: | 20 |
Proposed branch: | lp:~michael.nelson/charms/trusty/kibana/trunk |
Merge into: | lp:~canonical-is-sa/charms/trusty/kibana/trunk |
Diff against target: |
164 lines (+74/-11) 8 files modified
config.yaml (+9/-1) hooks/config-changed (+18/-0) hooks/install (+7/-2) hooks/start (+1/-3) hooks/stop (+3/-2) hooks/web-relation-joined (+3/-2) metadata.yaml (+1/-1) tests/12-port-change.py (+32/-0) |
To merge this branch: | bzr merge lp:~michael.nelson/charms/trusty/kibana/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Foley (community) | Approve | ||
Review via email: mp+275947@code.launchpad.net |
Commit message
Merge upstream (which now has web-relation-joined http relation).
Fixed conflicts.
Fixed charm proof errors.
Description of the change
This branch just re-merges the upstream lp:charms/trusty/kibana and resolves the conflicts (main one being that upstream still uses 'web' rather than 'website', even though it's changed the type to 'http').
Once this is merged, we should be able to ask for this MP to be merged upstream:
https:/
so that the exec.d support and elasticsearch url support gets added upstream.
I'm just testing this now with a local deploy.
To post a comment you must log in.
This looks good.