Merge ~ballot/content-cache-charm/+git/content-cache-charm:reuseport into content-cache-charm:master
Proposed by
Benjamin Allot
Status: | Merged |
---|---|
Approved by: | Haw Loeung |
Approved revision: | cbdb4806871eddfacf96762fe7344ba852470ff1 |
Merged at revision: | f13eeb0394a217e536b01f7d31ef413f55fce5cd |
Proposed branch: | ~ballot/content-cache-charm/+git/content-cache-charm:reuseport |
Merge into: | content-cache-charm:master |
Diff against target: |
238 lines (+112/-1) 7 files modified
config.yaml (+7/-0) lib/nginx.py (+1/-0) reactive/content_cache.py (+1/-0) templates/nginx_cfg.tmpl (+1/-1) tests/unit/files/nginx_config_rendered_test_output-reuseport.txt (+49/-0) tests/unit/test_content_cache.py (+51/-0) tests/unit/test_nginx.py (+2/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Joel Sing (community) | +1 | Approve | |
Haw Loeung | +1 | Approve | |
Review via email: mp+400068@code.launchpad.net |
Commit message
Add the reuseport directive in nginx.
To post a comment you must log in.
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.