lp:~mpontillo/maas/migrate-dns-settings-1.7
Created by
Mike Pontillo
and last modified
Only
Mike Pontillo
can upload to this branch. If you are
Mike Pontillo
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Andres Rodriguez (community): Approve
-
Diff: 639 lines (+372/-31)5 files modifieddocs/changelog.rst (+11/-0)
src/maasserver/management/commands/edit_named_options.py (+96/-12)
src/maasserver/tests/test_commands_edit_named_options.py (+141/-9)
src/maasserver/utils/isc.py (+25/-4)
src/maasserver/utils/tests/test_isc.py (+99/-6)
Superseded
for merging
into
lp:~maas-committers/maas/trunk
- MAAS Maintainers: Pending requested
-
Diff: 13596 lines (+10612/-113) (has conflicts)106 files modifiedMakefile (+7/-0)
contrib/maas-http.conf (+19/-0)
docs/changelog.rst (+163/-0)
docs/conf.py (+1/-1)
etc/maas/pserv.yaml.OTHER (+25/-0)
etc/maas/templates/commissioning-user-data/user_data_poweroff.template (+31/-0)
required-packages/base (+5/-0)
src/maas/development.py (+12/-1)
src/maas/settings.py (+6/-0)
src/maascli/api.py (+5/-0)
src/maascli/tests/test_api.py (+48/-0)
src/maasserver/api/doc.py (+11/-0)
src/maasserver/api/doc_handler.py (+5/-0)
src/maasserver/api/ip_addresses.py (+138/-0)
src/maasserver/api/nodegroups.py (+17/-0)
src/maasserver/api/nodes.py (+77/-1)
src/maasserver/api/pxeconfig.py (+19/-0)
src/maasserver/api/support.py (+16/-6)
src/maasserver/api/tests/test_doc.py (+79/-0)
src/maasserver/api/tests/test_ipaddresses.py (+274/-71)
src/maasserver/api/tests/test_node.py (+70/-0)
src/maasserver/api/tests/test_nodegroup.py (+75/-0)
src/maasserver/api/tests/test_pxeconfig.py (+17/-0)
src/maasserver/api/tests/test_support.py (+10/-0)
src/maasserver/api/tests/test_version.py (+8/-0)
src/maasserver/api/version.py (+13/-0)
src/maasserver/clusterrpc/tests/test_boot_images.py (+24/-0)
src/maasserver/dns/config.py (+28/-0)
src/maasserver/dns/tests/test_config.py (+11/-0)
src/maasserver/exceptions.py (+9/-0)
src/maasserver/fields.py (+26/-0)
src/maasserver/forms.py (+32/-1)
src/maasserver/forms_settings.py (+17/-0)
src/maasserver/management/commands/edit_named_options.py (+24/-0)
src/maasserver/models/config.py (+5/-0)
src/maasserver/models/macaddress.py (+74/-0)
src/maasserver/models/node.py (+102/-0)
src/maasserver/models/nodegroup.py (+27/-0)
src/maasserver/models/signals/power.py (+10/-0)
src/maasserver/models/tests/test_bootsource.py (+6/-0)
src/maasserver/models/tests/test_macaddress.py (+90/-0)
src/maasserver/models/tests/test_node.py (+159/-18)
src/maasserver/models/tests/test_nodegroup.py (+11/-0)
src/maasserver/rpc/nodes.py (+14/-0)
src/maasserver/rpc/tests/test_nodes.py (+32/-0)
src/maasserver/start_up.py (+93/-0)
src/maasserver/static/js/node_check.js.OTHER (+186/-0)
src/maasserver/static/js/node_views.js.OTHER (+680/-0)
src/maasserver/static/js/tests/test_node_check.html.OTHER (+36/-0)
src/maasserver/static/js/tests/test_node_check.js.OTHER (+128/-0)
src/maasserver/static/js/tests/test_node_views.html.OTHER (+55/-0)
src/maasserver/static/js/tests/test_node_views.js.OTHER (+1035/-0)
src/maasserver/static/js/utils.js.OTHER (+350/-0)
src/maasserver/templates/maasserver/base.html (+85/-0)
src/maasserver/templates/maasserver/node_actions.html (+29/-0)
src/maasserver/templates/maasserver/node_event_list_snippet.html.OTHER (+32/-0)
src/maasserver/templates/maasserver/node_view.html.OTHER (+292/-0)
src/maasserver/templates/maasserver/node_view_mac_display.html (+10/-0)
src/maasserver/templates/maasserver/nodes_listing.html.OTHER (+111/-0)
src/maasserver/templates/maasserver/snippets.html.OTHER (+67/-0)
src/maasserver/testing/factory.py (+30/-0)
src/maasserver/tests/test_dhcp.py (+11/-0)
src/maasserver/tests/test_fields.py (+38/-0)
src/maasserver/tests/test_forms_network.py (+76/-0)
src/maasserver/tests/test_forms_node.py (+9/-0)
src/maasserver/tests/test_js.py (+11/-0)
src/maasserver/tests/test_start_up.py (+64/-0)
src/maasserver/utils/isc.py (+286/-0)
src/maasserver/utils/mac.py (+34/-0)
src/maasserver/utils/tests/test_isc.py (+182/-0)
src/maasserver/utils/tests/test_mac.py (+35/-0)
src/maasserver/utils/tests/test_version.py (+217/-0)
src/maasserver/utils/version.py (+131/-0)
src/maasserver/views/nodes.py (+377/-6)
src/maasserver/views/tags.py.OTHER (+52/-0)
src/maasserver/views/tests/test_nodes.py.OTHER (+2766/-0)
src/maasserver/views/tests/test_rpc.py (+16/-2)
src/maasserver/views/tests/test_snippets.py (+47/-0)
src/maastesting/fixtures.py (+37/-0)
src/metadataserver/api.py (+10/-2)
src/metadataserver/models/commissioningscript.py (+41/-4)
src/metadataserver/models/tests/test_noderesults.py (+99/-0)
src/metadataserver/tests/test_api.py (+5/-0)
src/metadataserver/user_data/poweroff.py (+37/-0)
src/provisioningserver/boot/tests/test_boot.py (+7/-0)
src/provisioningserver/boot/tests/test_windows.py (+11/-0)
src/provisioningserver/boot/windows.py (+6/-0)
src/provisioningserver/config.py (+24/-0)
src/provisioningserver/dns/tests/test_config.py (+14/-0)
src/provisioningserver/drivers/hardware/tests/test_ucsm.py (+6/-0)
src/provisioningserver/drivers/hardware/ucsm.py (+21/-0)
src/provisioningserver/drivers/hardware/virsh.py (+12/-0)
src/provisioningserver/drivers/osystem/custom.py (+19/-0)
src/provisioningserver/drivers/osystem/tests/test_custom.py (+20/-0)
src/provisioningserver/plugin.py (+148/-0)
src/provisioningserver/rpc/boot_images.py (+22/-0)
src/provisioningserver/rpc/cluster.py (+4/-0)
src/provisioningserver/rpc/clusterservice.py (+34/-0)
src/provisioningserver/rpc/power.py (+38/-0)
src/provisioningserver/rpc/tests/test_boot_images.py (+53/-0)
src/provisioningserver/rpc/tests/test_clusterservice.py (+205/-0)
src/provisioningserver/rpc/tests/test_power.py (+57/-0)
src/provisioningserver/tests/test_config.py (+152/-0)
src/provisioningserver/tests/test_plugin.py (+5/-0)
src/provisioningserver/tests/test_plugin_services.py.OTHER (+87/-0)
utilities/update-new-and-modified-copyright (+15/-0)
Related bugs
Bug #1413388: [SRU] upgrade of MAAS removes local config for bind and breaks DNS | Critical | Fix Released |
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