Merge ~r00ta/maas:lp-2027735-3.2 into maas:3.2
Proposed by
Jacopo Rota
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jacopo Rota | ||||
Approved revision: | 9d7aa7e8a3363e326ed63280e4205192b305cb57 | ||||
Merge reported by: | MAAS Lander | ||||
Merged at revision: | not available | ||||
Proposed branch: | ~r00ta/maas:lp-2027735-3.2 | ||||
Merge into: | maas:3.2 | ||||
Diff against target: |
452 lines (+122/-52) 7 files modified
snap/local/tree/bin/run-regiond (+1/-1) src/maasserver/regiondservices/http.py (+17/-5) src/maasserver/regiondservices/tests/test_http.py (+20/-7) src/maasserver/templates/http/regiond.nginx.conf.template (+3/-1) src/maasserver/tests/test_workers.py (+51/-20) src/maasserver/webapp.py (+9/-7) src/maasserver/workers.py (+21/-11) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
MAAS Lander | Approve | ||
Jacopo Rota | Approve | ||
Review via email:
|
Commit message
Cherry pick fdd4e6da22c3f23
Description of the change
Cherry pick fdd4e6da22c3f23
To post a comment you must log in.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
UNIT TESTS
-b lp-2027735-3.2 lp:~r00ta/maas/+git/maas into -b 3.2 lp:~maas-committers/maas
STATUS: FAILED maas-ci. internal: 8080/job/ maas-tester/ 3060/console be2ac23de99d55b 5a35d8cb8c
LOG: http://
COMMIT: 71ed0a54011c998