Merge ~tcuthbert/content-cache-charm:master into content-cache-charm:master

Proposed by Thomas Cuthbert
Status: Merged
Approved by: Thomas Cuthbert
Approved revision: 50a9262f79266525229c25b64e5c4654a238f982
Merged at revision: 26a477fb2a192bc5685a9ec1d785c05b7ac731d6
Proposed branch: ~tcuthbert/content-cache-charm:master
Merge into: content-cache-charm:master
Diff against target: 13 lines (+1/-1)
1 file modified
reactive/content_cache.py (+1/-1)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+397212@code.launchpad.net

Commit message

Telegraf expects 'listener-address' rel key name

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM

review: Approve (+1)
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 26a477fb2a192bc5685a9ec1d785c05b7ac731d6

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/content_cache.py b/reactive/content_cache.py
2index 9c2520c..bd4a5e1 100644
3--- a/reactive/content_cache.py
4+++ b/reactive/content_cache.py
5@@ -498,7 +498,7 @@ def advertise_stats_endpoint():
6
7 for rel in rels['haproxy-statistics'].values():
8 rel.local['enabled'] = "True"
9- rel.local['listener_address'] = "127.0.0.1"
10+ rel.local['listener-address'] = "127.0.0.1"
11 rel.local['port'] = "10000"
12 rel.local['user'] = "haproxy"
13 rel.local['password'] = password

Subscribers

People subscribed via source and target branches