Merge ~hloeung/content-cache-charm:haproxy-config into content-cache-charm:master
Proposed by
Haw Loeung
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Haw Loeung | ||||
Approved revision: | 006445fc0ebead5c9333c09563e1aadbef0f0961 | ||||
Merged at revision: | 4eba9f57939da382d43929801d51d9143f4c12f1 | ||||
Proposed branch: | ~hloeung/content-cache-charm:haproxy-config | ||||
Merge into: | content-cache-charm:master | ||||
Diff against target: |
309 lines (+119/-3) 17 files modified
lib/haproxy.py (+9/-2) lib/utils.py (+13/-0) templates/haproxy_cfg.tmpl (+12/-0) tests/unit/files/content_cache_rendered_haproxy_test_output.txt (+7/-0) tests/unit/files/content_cache_rendered_haproxy_test_output2.txt (+7/-0) tests/unit/files/content_cache_rendered_haproxy_test_output3.txt (+7/-0) tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt (+7/-0) tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt (+7/-0) tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output2.txt (+6/-0) tests/unit/files/haproxy_config_rendered_test_output.txt (+7/-0) tests/unit/files/haproxy_config_rendered_test_output2.txt (+7/-0) tests/unit/files/resolv.conf (+3/-0) tests/unit/files/resolv.conf-none (+1/-0) tests/unit/files/resolv.conf2 (+2/-0) tests/unit/test_content_cache.py (+5/-0) tests/unit/test_haproxy.py (+11/-1) tests/unit/test_utils.py (+8/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stuart Bishop (community) | Approve | ||
Content Cache Charmers | Pending | ||
Review via email: mp+382891@code.launchpad.net |
Commit message
Use resolvers when hostname rather than IP provided
To post a comment you must log in.
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.