Merge lp:~lamont/maas/bug-1568847b into lp:~maas-committers/maas/trunk
Proposed by
LaMont Jones
Status: | Merged |
---|---|
Approved by: | LaMont Jones |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4927 |
Proposed branch: | lp:~lamont/maas/bug-1568847b |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
191 lines (+47/-11) 5 files modified
src/maasserver/proxyconfig.py (+12/-6) src/maasserver/service_monitor.py (+4/-0) src/maasserver/tests/test_proxyconfig.py (+7/-4) src/maasserver/tests/test_service_monitor.py (+22/-1) src/provisioningserver/templates/proxy/maas-proxy.conf.template (+2/-0) |
To merge this branch: | bzr merge lp:~lamont/maas/bug-1568847b |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+292050@code.launchpad.net |
Commit message
Only start maas-proxy if we have a configuration file.
Description of the change
Only start maas-proxy if we have a configuration file.
To post a comment you must log in.
Nicely done.