Merge lp://staging/~ricardokirkner/charms/trusty/logstash/logstash2-haproxy-service-name into lp://staging/~canonical-is-sa/charms/trusty/logstash/logstash2
Proposed by
Ricardo Kirkner
| Status: | Merged |
|---|---|
| Merged at revision: | 68 |
| Proposed branch: | lp://staging/~ricardokirkner/charms/trusty/logstash/logstash2-haproxy-service-name |
| Merge into: | lp://staging/~canonical-is-sa/charms/trusty/logstash/logstash2 |
| Diff against target: |
44 lines (+14/-2) 3 files modified
config.yaml (+10/-0) hooks/beats-relation-changed (+2/-1) hooks/lumberjack-relation-changed (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~ricardokirkner/charms/trusty/logstash/logstash2-haproxy-service-name |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Canonical IS SAs | Pending | ||
|
Review via email:
|
|||
Commit message
set service_name when changing relation so haproxy can setup different backends for lumberjack/beats
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
