~nick-moffitt/content-cache-charm:per-location-listen-stanzas

Branch merges

Propose for merging

Merged into content-cache-charm:master at revision bcad84d4df6f5a869b1b3ca76ba26aa7f4871a3e

Tom Haddon (community): Approve on 2019-05-23

Canonical IS Reviewers: Pending requested 2019-05-23

Diff: 85 lines (+28/-1)

3 files modified

lib/haproxy.py (+18/-1)
reactive/content_cache.py (+2/-0)
tests/unit/files/content_cache_rendered_haproxy_test_output.txt (+8/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

Related rock recipes

ddbcef1... by Nick Moffitt on 2019-05-23

Keep track of listen stanza names to deduplicate

94d3124... by Nick Moffitt on 2019-05-23

Remove duplicate listen stanzas per-port

d9d288e... by Nick Moffitt on 2019-05-23

Fix listen stanza names to match backends

28a85c1... by Nick Moffitt on 2019-05-23

Merge per-location listen stanzas with own ports

b6e449f... by Nick Moffitt on 2019-05-23

Config site5 to have ports and its own listen stanzas

462964e... by Nick Moffitt on 2019-05-23

black --skip-string-normalization --line-length=120

Reviewed-on: https://code.launchpad.net/~nick-moffitt/content-cache-charm/+git/content-cache-charm/+merge/367633
Reviewed-by: Stuart Bishop <email address hidden>

1d99f72... by Nick Moffitt on 2019-05-22

Merge branch 'master' into black-noquotes

11809b1... by Nick Moffitt on 2019-05-22

Use the nrpe workaround in config-changed as well

Reviewed-on: https://code.launchpad.net/~nick-moffitt/content-cache-charm/+git/content-cache-charm/+merge/367740
Reviewed-by: Tom Haddon <email address hidden>

ebb2337... by Nick Moffitt on 2019-05-22

Use the nrpe workaround in config-changed as well

8665d1e... by Nick Moffitt on 2019-05-20

include black in tox automation