~blake-rouse/maas:use-http-rack
Last commit made on
2018-06-20
- Get this branch:
-
git clone
-b use-http-rack
https://git.launchpad.net/~blake-rouse/maas
Only
Blake Rouse
can upload to this branch. If you are
Blake Rouse
please log in for upload directions.
Branch merges
Propose for merging
Merged
into
maas:master
- Andres Rodriguez (community): Approve
- MAAS Lander: Approve
-
Diff: 2167 lines (+401/-398)19 files modifiedsrc/maasserver/api/machines.py (+3/-2)
src/maasserver/api/tests/test_machine.py (+1/-1)
src/maasserver/compose_preseed.py (+41/-75)
src/maasserver/djangosettings/settings.py (+4/-0)
src/maasserver/forms/settings.py (+14/-0)
src/maasserver/models/config.py (+2/-0)
src/maasserver/node_action.py (+11/-1)
src/maasserver/preseed.py (+69/-92)
src/maasserver/rpc/boot.py (+14/-4)
src/maasserver/rpc/tests/test_boot.py (+27/-14)
src/maasserver/tests/test_compose_preseed.py (+66/-50)
src/maasserver/tests/test_node_action.py (+6/-6)
src/maasserver/tests/test_preseed.py (+85/-126)
src/maastesting/http.py (+19/-0)
src/metadataserver/api.py (+8/-12)
src/metadataserver/tests/test_api.py (+4/-2)
src/metadataserver/user_data/__init__.py (+16/-10)
src/provisioningserver/rackdservices/tests/test_http.py (+1/-1)
src/provisioningserver/templates/http/rackd.nginx.conf.template (+10/-2)
Branch information
- Name:
- use-http-rack
- Repository:
- lp:~blake-rouse/maas