Viewing all changes in revision 5677.1.2.
- Committer: LaMont Jones
- Date: 2017-02-17 14:23:04 UTC
- mfrom: (5747 maas)
- mto: This revision was merged to the branch mainline in revision 5748.
- Revision ID: lamont@canonical.com-20170217142304-djxqtuvefc1sdfnb
Merge trunk
- files added:
- docs/development/notifications.rst
- src/maasserver/forms
- src/maasserver/forms/tests
- src/metadataserver/builtin_scripts
- src/metadataserver/builtin_scripts/tests
- src/metadataserver/user_data/templates/snippets/maas_api_helper.py
- files removed:
- docs/about.rst
- docs/install.rst
- src/maasserver/static/assets/images/backgrounds
- src/maasserver/static/assets/images/forms
- src/maasserver/static/assets/images/logos
- src/provisioningserver/templates/commissioning-user-data/snippets/maas_api_helper.py
- files renamed:
- src/maasserver/forms.py => src/maasserver/forms/__init__.py
- src/maasserver/forms_dhcpsnippet.py => src/maasserver/forms/dhcpsnippet.py
- src/maasserver/forms_dnsdata.py => src/maasserver/forms/dnsdata.py
- src/maasserver/forms_dnsresource.py => src/maasserver/forms/dnsresource.py
- src/maasserver/forms_domain.py => src/maasserver/forms/domain.py
- src/maasserver/forms_commission.py => src/maasserver/forms/ephemeral.py
- src/maasserver/forms_fabric.py => src/maasserver/forms/fabric.py
- src/maasserver/forms_fannetwork.py => src/maasserver/forms/fannetwork.py
- src/maasserver/forms_filesystem.py => src/maasserver/forms/filesystem.py
- src/maasserver/forms_interface.py => src/maasserver/forms/interface.py
- src/maasserver/forms_interface_link.py => src/maasserver/forms/interface_link.py
- src/maasserver/forms_iprange.py => src/maasserver/forms/iprange.py
- src/maasserver/forms_packagerepository.py => src/maasserver/forms/packagerepository.py
- src/maasserver/forms_settings.py => src/maasserver/forms/settings.py
- src/maasserver/forms_space.py => src/maasserver/forms/space.py
- src/maasserver/forms_staticroute.py => src/maasserver/forms/staticroute.py
- src/maasserver/forms_subnet.py => src/maasserver/forms/subnet.py
- src/maasserver/tests/test_forms_bcache.py => src/maasserver/forms/tests/test_bcache.py
- src/maasserver/tests/test_forms_blockdevice.py => src/maasserver/forms/tests/test_blockdevice.py
- src/maasserver/tests/test_forms_bootresource.py => src/maasserver/forms/tests/test_bootresource.py
- src/maasserver/tests/test_forms_bootsource.py => src/maasserver/forms/tests/test_bootsource.py
- src/maasserver/tests/test_forms_bootsourceselection.py => src/maasserver/forms/tests/test_bootsourceselection.py
- src/maasserver/tests/test_forms_bulknodeaction.py => src/maasserver/forms/tests/test_bulknodeaction.py
- src/maasserver/tests/test_forms_cacheset.py => src/maasserver/forms/tests/test_cacheset.py
- src/maasserver/tests/test_forms_commissioning.py => src/maasserver/forms/tests/test_commissioning.py
- src/maasserver/tests/test_forms_config.py => src/maasserver/forms/tests/test_config.py
- src/maasserver/tests/test_forms_controller.py => src/maasserver/forms/tests/test_controller.py
- src/maasserver/tests/test_forms_deploy.py => src/maasserver/forms/tests/test_deploy.py
- src/maasserver/tests/test_forms_device.py => src/maasserver/forms/tests/test_device.py
- src/maasserver/tests/test_forms_dhcpsnippet.py => src/maasserver/forms/tests/test_dhcpsnippet.py
- src/maasserver/tests/test_forms_dnsdata.py => src/maasserver/forms/tests/test_dnsdata.py
- src/maasserver/tests/test_forms_dnsresource.py => src/maasserver/forms/tests/test_dnsresource.py
- src/maasserver/tests/test_forms_domain.py => src/maasserver/forms/tests/test_domain.py
- src/maasserver/tests/test_forms_commission.py => src/maasserver/forms/tests/test_ephemeral.py
- src/maasserver/tests/test_forms_fabric.py => src/maasserver/forms/tests/test_fabric.py
- src/maasserver/tests/test_forms_fannetwork.py => src/maasserver/forms/tests/test_fannetwork.py
- src/maasserver/tests/test_forms_filesystem.py => src/maasserver/forms/tests/test_filesystem.py
- src/maasserver/tests/test_forms_helpers.py => src/maasserver/forms/tests/test_helpers.py
- src/maasserver/tests/test_forms_instancelistfield.py => src/maasserver/forms/tests/test_instancelistfield.py
- src/maasserver/tests/test_forms_interface.py => src/maasserver/forms/tests/test_interface.py
- src/maasserver/tests/test_forms_interface_link.py => src/maasserver/forms/tests/test_interface_link.py
- src/maasserver/tests/test_forms_iprange.py => src/maasserver/forms/tests/test_iprange.py
- src/maasserver/tests/test_forms_licensekey.py => src/maasserver/forms/tests/test_licensekey.py
- src/maasserver/tests/test_forms_machine.py => src/maasserver/forms/tests/test_machine.py
- src/maasserver/tests/test_forms_machinewithmacaddresses.py => src/maasserver/forms/tests/test_machinewithmacaddresses.py
- src/maasserver/tests/test_forms_merge_error_messages.py => src/maasserver/forms/tests/test_merge_error_messages.py
- src/maasserver/tests/test_forms_multiplechoicefield.py => src/maasserver/forms/tests/test_multiplechoicefield.py
- src/maasserver/tests/test_forms_node.py => src/maasserver/forms/tests/test_node.py
- src/maasserver/tests/test_forms_packagerepository.py => src/maasserver/forms/tests/test_packagerepository.py
- src/maasserver/tests/test_forms_partition.py => src/maasserver/forms/tests/test_partition.py
- src/maasserver/tests/test_forms_pods.py => src/maasserver/forms/tests/test_pods.py
- src/maasserver/tests/test_forms_raid.py => src/maasserver/forms/tests/test_raid.py
- src/maasserver/tests/test_forms_settings.py => src/maasserver/forms/tests/test_settings.py
- src/maasserver/tests/test_forms_space.py => src/maasserver/forms/tests/test_space.py
- src/maasserver/tests/test_forms_staticroute.py => src/maasserver/forms/tests/test_staticroute.py
- src/maasserver/tests/test_forms_subnet.py => src/maasserver/forms/tests/test_subnet.py
- src/maasserver/tests/test_forms_ubuntu.py => src/maasserver/forms/tests/test_ubuntu.py
- src/maasserver/tests/test_forms_user.py => src/maasserver/forms/tests/test_user.py
- src/maasserver/tests/test_forms_vlan.py => src/maasserver/forms/tests/test_vlan.py
- src/maasserver/tests/test_forms_volume_group.py => src/maasserver/forms/tests/test_volume_group.py
- src/maasserver/tests/test_forms_zone.py => src/maasserver/forms/tests/test_zone.py
- src/maasserver/forms_vlan.py => src/maasserver/forms/vlan.py
- src/maasserver/models/tests/test_components.py => src/maasserver/tests/test_components.py
- src/metadataserver/user_data/utils.py => src/metadataserver/user_data/__init__.py
- src/provisioningserver/templates/commissioning-user-data/ => src/metadataserver/user_data/templates/
- src/provisioningserver/templates/commissioning-user-data/user_data.template => src/metadataserver/user_data/templates/commissioning.template
- src/provisioningserver/templates/commissioning-user-data/user_data_disk_erasing.template => src/metadataserver/user_data/templates/disk_erasing.template
- src/provisioningserver/templates/commissioning-user-data/user_data_poweroff.template => src/metadataserver/user_data/templates/poweroff.template
- src/provisioningserver/templates/commissioning-user-data/user_data_rescue_mode.template => src/metadataserver/user_data/templates/rescue_mode.template
- files modified:
- .bzrignore
expand all
collapse all
added
removed
src/maasserver/static/assets/images/04d2075a-chevron-down.svg
src/maasserver/static/assets/images/1cdcdb82-system-shutdown.svg
src/maasserver/static/assets/images/2355399b-info.svg
src/maasserver/static/assets/images/314a253d-settings.svg
src/maasserver/static/assets/images/3fd57564-mount.svg
src/maasserver/static/assets/images/46b44caf-checkbox-hover.svg
src/maasserver/static/assets/images/480f6014-add-partition.svg
src/maasserver/static/assets/images/501ee9c0-add-logical-volume.svg
src/maasserver/static/assets/images/50fc9223-power-off.svg
src/maasserver/static/assets/images/5777c0c7-warning.svg
src/maasserver/static/assets/images/5c9708d2-add.svg
src/maasserver/static/assets/images/6c395e6d-green-tick.svg
src/maasserver/static/assets/images/82993327-mount.svg
src/maasserver/static/assets/images/89c10794-remove.svg
src/maasserver/static/assets/images/89c6b797-success.svg
src/maasserver/static/assets/images/8b7b3046-in_progress.png
src/maasserver/static/assets/images/8b7b3046-loading.png
src/maasserver/static/assets/images/8b8eb7d5-partition.svg
src/maasserver/static/assets/images/908ee6a0-help.svg
src/maasserver/static/assets/images/9cc42dcc-magnifying_glass.svg
src/maasserver/static/assets/images/a02192e3-debug.svg
src/maasserver/static/assets/images/b2fadbbe-tooltip.svg
src/maasserver/static/assets/images/b5573b6a-delete.svg
src/maasserver/static/assets/images/b562c17f-edit.svg
src/maasserver/static/assets/images/b77e606e-logical-volume.svg
src/maasserver/static/assets/images/b8119c45-power-error.svg
src/maasserver/static/assets/images/backgrounds/background-paper.png
src/maasserver/static/assets/images/d0374f79-tags.svg
src/maasserver/static/assets/images/d53683c4-power-on.svg
src/maasserver/static/assets/images/d730daea-error.svg
src/maasserver/static/assets/images/d760df7b-account.svg
src/maasserver/static/assets/images/d88a05ba-unmount.svg
src/maasserver/static/assets/images/db8d0984-checkbox.svg
src/maasserver/static/assets/images/f3f43376-chevron-up.svg
src/maasserver/static/assets/images/f5453933-sync.svg
src/maasserver/static/assets/images/forms/checkbox-checked.svg
src/maasserver/static/assets/images/forms/checkbox.svg
src/maasserver/static/assets/images/forms/chevron-down.svg
src/maasserver/static/assets/images/forms/chevron-up.svg
src/maasserver/static/assets/images/forms/chevron_down.svg
src/maasserver/static/assets/images/forms/chevron_up.svg
src/maasserver/static/assets/images/icons/account.svg
src/maasserver/static/assets/images/icons/add-logical-volume.svg
src/maasserver/static/assets/images/icons/add-partition.svg
src/maasserver/static/assets/images/icons/add.svg
src/maasserver/static/assets/images/icons/cross-orange.svg
src/maasserver/static/assets/images/icons/cross.svg
src/maasserver/static/assets/images/icons/cross_orange.svg
src/maasserver/static/assets/images/icons/debug.png
src/maasserver/static/assets/images/icons/debug.svg
src/maasserver/static/assets/images/icons/delete.png
src/maasserver/static/assets/images/icons/delete.svg
src/maasserver/static/assets/images/icons/edit.png
src/maasserver/static/assets/images/icons/edit.svg
src/maasserver/static/assets/images/icons/error.png
src/maasserver/static/assets/images/icons/green-tick.svg
src/maasserver/static/assets/images/icons/help.png
src/maasserver/static/assets/images/icons/help.svg
src/maasserver/static/assets/images/icons/in_progress.png
src/maasserver/static/assets/images/icons/in_progress@2x.png
src/maasserver/static/assets/images/icons/info-mono.svg
src/maasserver/static/assets/images/icons/info.png
src/maasserver/static/assets/images/icons/info.svg
src/maasserver/static/assets/images/icons/loading.png
src/maasserver/static/assets/images/icons/logical-volume.svg
src/maasserver/static/assets/images/icons/magnifying_glass.svg
src/maasserver/static/assets/images/icons/mount.svg
src/maasserver/static/assets/images/icons/partition.svg
src/maasserver/static/assets/images/icons/power-error.svg
src/maasserver/static/assets/images/icons/power-off.svg
src/maasserver/static/assets/images/icons/power-on.svg
src/maasserver/static/assets/images/icons/remove.svg
src/maasserver/static/assets/images/icons/settings.svg
src/maasserver/static/assets/images/icons/success-mono.svg
src/maasserver/static/assets/images/icons/success.png
src/maasserver/static/assets/images/icons/success.svg
src/maasserver/static/assets/images/icons/success_colour_black.svg
src/maasserver/static/assets/images/icons/success_colour_white.svg
src/maasserver/static/assets/images/icons/success_mono.svg
src/maasserver/static/assets/images/icons/sync.svg
src/maasserver/static/assets/images/icons/system-shutdown.svg
src/maasserver/static/assets/images/icons/tags.svg
src/maasserver/static/assets/images/icons/tick.svg
src/maasserver/static/assets/images/icons/tooltip.svg
src/maasserver/static/assets/images/icons/unmount.svg
src/maasserver/static/assets/images/icons/warning-mono.svg
src/maasserver/static/assets/images/icons/warning.png
src/maasserver/static/assets/images/icons/warning.svg
src/maasserver/static/assets/images/icons/warning_colour_black.svg
src/maasserver/static/assets/images/icons/warning_colour_white.svg
src/maasserver/static/assets/images/icons/warning_mono.svg
src/maasserver/static/assets/images/logos/logo-ubuntu-grey.png
src/maasserver/static/assets/images/logos/logo-ubuntu-orange.png
src/maasserver/static/assets/images/logos/logo-ubuntu-orange.svg
src/maasserver/static/assets/images/logos/maas-logo.png
src/maasserver/static/assets/images/logos/maas-logo.svg
