Merge lp:~verterok/charms/trusty/logstash/fix-the-thing into lp:~tanuki/charms/trusty/logstash/trunk
Proposed by
Guillermo Gonzalez
Status: | Merged |
---|---|
Approved by: | Guillermo Gonzalez |
Approved revision: | 56 |
Merged at revision: | 55 |
Proposed branch: | lp:~verterok/charms/trusty/logstash/fix-the-thing |
Merge into: | lp:~tanuki/charms/trusty/logstash/trunk |
Diff against target: |
58 lines (+19/-13) 2 files modified
hooks/client-relation-changed (+15/-13) hooks/config-changed (+4/-0) |
To merge this branch: | bzr merge lp:~verterok/charms/trusty/logstash/fix-the-thing |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Celso Providelo (community) | Approve | ||
Review via email: mp+270426@code.launchpad.net |
Commit message
Fix config-changed to not overwrite ES config. Also make cache_hosts (in hooks/client-
Description of the change
- Make cache_hosts (in hooks/client-
This simplified debugging the hooks. can remove it if there are any objections
- Fix copy_config (hooks/
To post a comment you must log in.
Guillermo,
As pointed on IRC, good catch on the "output" template overwrite.
I am not sure how iterating over all "client" relations would affect us, specially when we have multiple ES units. However it's not a problem for now.