lp:~ltrager/maas/lp1593991_2.0
Created by
Lee Trager
and last modified
Only
Lee Trager
can upload to this branch. If you are
Lee Trager
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Mike Pontillo (community): Approve
-
Diff: 1223 lines (+297/-141)21 files modifiedsrc/maasserver/api/machines.py (+0/-3)
src/maasserver/api/tests/test_enlistment.py (+21/-12)
src/maasserver/api/tests/test_machine.py (+35/-22)
src/maasserver/api/tests/test_node.py (+1/-1)
src/maasserver/api/tests/test_rackcontroller.py (+2/-1)
src/maasserver/api/tests/test_utils.py (+20/-0)
src/maasserver/api/utils.py (+14/-1)
src/maasserver/clusterrpc/power_parameters.py (+24/-5)
src/maasserver/clusterrpc/tests/test_power_parameters.py (+48/-0)
src/maasserver/config_forms.py (+3/-0)
src/maasserver/forms.py (+37/-6)
src/maasserver/rpc/nodes.py (+0/-4)
src/maasserver/rpc/tests/test_nodes.py (+18/-32)
src/maasserver/testing/factory.py (+2/-3)
src/maasserver/tests/test_config_forms.py (+9/-0)
src/maasserver/tests/test_forms_controller.py (+4/-2)
src/maasserver/tests/test_forms_machine.py (+4/-1)
src/maasserver/websockets/handlers/machine.py (+2/-9)
src/maasserver/websockets/handlers/tests/test_machine.py (+7/-4)
src/maasserver/websockets/tests/test_base.py (+2/-2)
src/provisioningserver/power/schema.py (+44/-33)
Superseded
for merging
into
lp:~maas-committers/maas/trunk
- MAAS Maintainers: Pending requested
-
Diff: 4158 lines (+3178/-21) (has conflicts)42 files modifiedMakefile (+1/-1)
docs/about.rst (+9/-0)
docs/changelog.rst (+522/-0)
docs/index.rst (+9/-0)
src/maasserver/api/account.py (+23/-0)
src/maasserver/api/interfaces.py (+4/-0)
src/maasserver/api/tests/test_ipaddresses.py (+9/-0)
src/maasserver/api/tests/test_machine.py (+37/-0)
src/maasserver/bootresources.py (+37/-0)
src/maasserver/dhcp.py (+72/-0)
src/maasserver/enum.py (+6/-0)
src/maasserver/migrations/builtin/maasserver/0066_allow_squashfs.py (+22/-0)
src/maasserver/models/node.py (+101/-17)
src/maasserver/models/staticipaddress.py (+94/-0)
src/maasserver/models/tests/test_node.py (+177/-0)
src/maasserver/models/tests/test_staticipaddress.py (+68/-3)
src/maasserver/node_status.py (+16/-0)
src/maasserver/preseed_network.py (+12/-0)
src/maasserver/rpc/tests/test_regionservice.py (+14/-0)
src/maasserver/static/css/maas-styles.css.OTHER (+1/-0)
src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js (+89/-0)
src/maasserver/static/partials/node-details.html (+6/-0)
src/maasserver/static/partials/node-events.html (+14/-0)
src/maasserver/static/partials/nodes-list.html (+173/-0)
src/maasserver/static/scss/maas/components/_accordion.scss.OTHER (+112/-0)
src/maasserver/templates/maasserver/base.html (+7/-0)
src/maasserver/templates/maasserver/index.html (+21/-0)
src/maasserver/templates/maasserver/prefs.html (+5/-0)
src/maasserver/testing/factory.py (+5/-0)
src/maasserver/tests/test_bootresources.py (+108/-0)
src/maasserver/tests/test_dhcp.py (+74/-0)
src/maasserver/tests/test_preseed.py (+27/-0)
src/maasserver/tests/test_preseed_network.py (+4/-0)
src/maasserver/tests/test_start_up.py (+93/-0)
src/maasserver/triggers/tests/test_websocket_listener.py (+124/-0)
src/maasserver/views/tests/test_images.py.OTHER (+991/-0)
src/metadataserver/api.py (+7/-0)
src/provisioningserver/dns/tests/test_zoneconfig.py (+47/-0)
src/provisioningserver/events.py (+11/-0)
src/provisioningserver/plugin.py (+12/-0)
src/provisioningserver/power/schema.py (+6/-0)
src/provisioningserver/tests/test_plugin.py (+8/-0)
Related bugs
Related blueprints
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~maas-committers/maas/trunk