Merge ~hloeung/content-cache-charm:master into content-cache-charm:master
Proposed by
Haw Loeung
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Haw Loeung | ||||
| Approved revision: | 7d3dec5ae404b4db32d11d65cb1114c5ac532031 | ||||
| Merged at revision: | cc8cc0a95958ba26a89f2d4b56fba481669c88e8 | ||||
| Proposed branch: | ~hloeung/content-cache-charm:master | ||||
| Merge into: | content-cache-charm:master | ||||
| Diff against target: |
286 lines (+84/-7) 13 files modified
lib/haproxy.py (+29/-5) reactive/content_cache.py (+4/-0) tests/unit/files/config_test_config.txt (+5/-0) tests/unit/files/content_cache_rendered_haproxy_test_output.txt (+1/-0) tests/unit/files/content_cache_rendered_haproxy_test_output3.txt (+1/-1) tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt (+1/-0) tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt (+1/-0) tests/unit/files/haproxy_config_rendered_listen_stanzas_test_output.txt (+1/-0) tests/unit/files/haproxy_config_rendered_listen_stanzas_test_output2.txt (+1/-1) tests/unit/files/haproxy_config_rendered_listen_stanzas_test_output3.txt (+14/-0) tests/unit/files/haproxy_config_rendered_test_output.txt (+1/-0) tests/unit/files/haproxy_config_rendered_test_output2.txt (+1/-0) tests/unit/test_haproxy.py (+24/-0) |
||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stuart Bishop (community) | Approve | ||
| Content Cache Charmers | Pending | ||
|
Review via email:
|
|||
Commit message
Allow specifying default site - LP:1863170
To post a comment you must log in.
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.