Merge lp:~michael.nelson/charms/trusty/kibana/kibana4 into lp:~canonical-is-sa/charms/trusty/kibana/kibana4
Proposed by
Michael Nelson
Status: | Merged |
---|---|
Merged at revision: | 21 |
Proposed branch: | lp:~michael.nelson/charms/trusty/kibana/kibana4 |
Merge into: | lp:~canonical-is-sa/charms/trusty/kibana/kibana4 |
Diff against target: |
456 lines (+159/-135) 14 files modified
README.md (+2/-2) config.yaml (+2/-10) files/charm/config.js (+0/-75) files/charm/config.yml (+79/-0) files/charm/kibana.init (+32/-0) files/charm/kibana_lb.conf (+15/-0) files/charm/nginx.conf (+3/-33) files/charm/nginx_lb.conf (+1/-1) hooks/config-changed (+1/-2) hooks/install (+15/-11) hooks/start (+1/-0) hooks/stop (+1/-0) tests/11-scale-elastic.py (+1/-1) tests/12-port-change.py (+6/-0) |
To merge this branch: | bzr merge lp:~michael.nelson/charms/trusty/kibana/kibana4 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Kuhlman (community) | Approve | ||
Review via email:
|
Commit message
Required changes for Kibana 4
Description of the change
This branch merges a community branch [1] (not landed upstream) to support kibana4, and then makes a few changes.
I'll comment inline below on the significant changes.
[1] https:/
To post a comment you must log in.
Including inline comments.