← Back to branch summary

~blake-rouse/maas/osystem-preseed-cleanup

~blake-rouse/maas/osystem-preseed-cleanup

Viewing all changes in revision 2301.

Committer: Blake Rouse
Date: 2014-05-29 18:20:58 UTC
mfrom: (2288.1.13 5_add-osystem-to-node-html-js)
Revision ID: blake.rouse@canonical.com-20140529182058-8gue2eia2bljyv3y

Merge trunk, fix doc string for compose_preseed.

files added:
etc/maas/templates/power/ucsm.template

etc/maas/templates/uefi/config.local.ppc64el.template

src/maasserver/migrations/0077_remove_null_for_bootsourceselection_release.py

src/maasserver/migrations/0078_add_osystem_to_node.py

src/maasserver/migrations/0079_supported_subarches_for_bootimage.py

src/maasserver/migrations/0080_binary_to_editablebinary_in_bootsource.py

src/maasserver/models/bootsourceselection.py

src/maasserver/models/tests/test_bootsourceselection.py

src/maasserver/static/js/os_distro_select.js

src/maasserver/static/js/tests/test_os_distro_select.html

src/maasserver/static/js/tests/test_os_distro_select.js

src/maasserver/tests/test_api_boot_source_selections.py

src/maasserver/tests/test_api_boot_sources.py

src/provisioningserver/boot/powerkvm.py

src/provisioningserver/boot/tests/test_powerkvm.py

src/provisioningserver/custom_hardware/tests/test_ucsm.py

src/provisioningserver/custom_hardware/tests/test_virsh.py

src/provisioningserver/custom_hardware/ucsm.py

src/provisioningserver/custom_hardware/virsh.py

src/provisioningserver/dhcp/leases_parser_fast.py

src/provisioningserver/import_images/keyrings.py

src/provisioningserver/import_images/tests/test_download_resources.py

src/provisioningserver/import_images/tests/test_keyrings.py

files removed:
etc/maas/bootresources.yaml

etc/maas/import_pxe_files

src/maasserver/migrations/0077_add_osystem_to_node.py

src/maasserver/static/js/os_distro_select.js

src/maasserver/static/js/tests/test_os_distro_select.html

src/maasserver/static/js/tests/test_os_distro_select.js

files renamed:
etc/maas/templates/uefi/config.local.template => etc/maas/templates/uefi/config.local.amd64.template

files modified:
Makefile

contrib/preseeds_v2/preseed_master

docs/changelog.rst

docs/cluster-configuration.rst

docs/hardware-enablement-kernels.rst

docs/installing-ubuntu.rst

docs/man/maas-import-pxe-files.8.rst

docs/orientation.rst

docs/troubleshooting.rst

etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh

etc/maas/templates/power/virsh.template

etc/maas/templates/uefi/config.commissioning.template

etc/maas/templates/uefi/config.install.template

man/maas-import-pxe-files.8

man/maas-region-admin.8

man/maas.8

required-packages/base

setup.py

src/maas/development.py

src/maas/settings.py

src/maasserver/api.py

src/maasserver/fields.py

src/maasserver/forms.py

src/maasserver/forms_settings.py

src/maasserver/migrations/0076_add_osystem_to_bootimage.py

src/maasserver/models/__init__.py

src/maasserver/models/bootimage.py

src/maasserver/models/bootsource.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/tests/test_bootimage.py

src/maasserver/models/tests/test_bootsource.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodegroup.py

src/maasserver/node_action.py

src/maasserver/start_up.py

src/maasserver/static/js/node_add.js

src/maasserver/templates/maasserver/no-bootimages-warning.html

src/maasserver/templates/maasserver/prefs.html

src/maasserver/testing/factory.py

src/maasserver/testing/osystems.py

src/maasserver/tests/test_api_boot_images.py

src/maasserver/tests/test_api_enlistment.py

src/maasserver/tests/test_api_node.py

src/maasserver/tests/test_api_nodegroup.py

src/maasserver/tests/test_api_nodes.py

src/maasserver/tests/test_api_pxeconfig.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_start_up.py

src/maasserver/urls_api.py

src/maasserver/views/combo.py

src/maasserver/views/tests/test_settings.py

src/maastesting/factory.py

src/maastesting/tests/test_factory.py

src/provisioningserver/boot/__init__.py

src/provisioningserver/boot/pxe.py

src/provisioningserver/boot/tests/test_boot.py

src/provisioningserver/boot/tests/test_pxe.py

src/provisioningserver/boot/tests/test_tftppath.py

src/provisioningserver/boot/tests/test_uefi.py

src/provisioningserver/boot/tftppath.py

src/provisioningserver/boot/uefi.py

src/provisioningserver/boot_images.py

src/provisioningserver/config.py

src/provisioningserver/custom_hardware/utils.py

src/provisioningserver/dhcp/leases.py

src/provisioningserver/dhcp/tests/test_leases_parser.py

src/provisioningserver/driver/__init__.py

src/provisioningserver/driver/tests/test_os_ubuntu.py

src/provisioningserver/import_images/boot_image_mapping.py

src/provisioningserver/import_images/boot_resources.py

src/provisioningserver/import_images/download_descriptions.py

src/provisioningserver/import_images/download_resources.py

src/provisioningserver/import_images/testing/factory.py

src/provisioningserver/import_images/tests/test_boot_image_mapping.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/power/tests/test_poweraction.py

src/provisioningserver/power_schema.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/tasks.py

src/provisioningserver/testing/boot_images.py

src/provisioningserver/testing/config.py

src/provisioningserver/tests/test_config.py

src/provisioningserver/tests/test_tasks.py

src/provisioningserver/tests/test_tftp.py

src/provisioningserver/tests/test_upgrade_cluster.py

src/provisioningserver/tftp.py

src/provisioningserver/upgrade_cluster.py

src/provisioningserver/utils/__init__.py

src/provisioningserver/utils/tests/test_utils.py

Show diffs side-by-side

added added

removed removed

contrib/preseeds_v2/preseed_master

docs/changelog.rst

docs/cluster-configuration.rst

docs/hardware-enablement-kernels.rst

docs/installing-ubuntu.rst

docs/man/maas-import-pxe-files.8.rst

docs/orientation.rst

docs/troubleshooting.rst

etc/maas/bootresources.yaml

etc/maas/import_pxe_files

etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh

etc/maas/templates/power/ucsm.template

etc/maas/templates/power/virsh.template

etc/maas/templates/uefi/config.commissioning.template

etc/maas/templates/uefi/config.install.template

etc/maas/templates/uefi/config.local.amd64.template

etc/maas/templates/uefi/config.local.ppc64el.template

man/maas-import-pxe-files.8

man/maas-region-admin.8

required-packages/base

src/maas/development.py

src/maas/settings.py

src/maasserver/api.py

src/maasserver/fields.py

src/maasserver/forms.py

src/maasserver/forms_settings.py

src/maasserver/migrations/0076_add_osystem_to_bootimage.py

src/maasserver/migrations/0077_add_osystem_to_node.py

src/maasserver/migrations/0077_remove_null_for_bootsourceselection_release.py

src/maasserver/migrations/0078_add_osystem_to_node.py

src/maasserver/migrations/0079_supported_subarches_for_bootimage.py

src/maasserver/migrations/0080_binary_to_editablebinary_in_bootsource.py

src/maasserver/models/__init__.py

src/maasserver/models/bootimage.py

src/maasserver/models/bootsource.py

src/maasserver/models/bootsourceselection.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/tests/test_bootimage.py

src/maasserver/models/tests/test_bootsource.py

src/maasserver/models/tests/test_bootsourceselection.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodegroup.py

src/maasserver/node_action.py

src/maasserver/start_up.py

src/maasserver/static/js/node_add.js

src/maasserver/static/js/os_distro_select.js

src/maasserver/static/js/os_distro_select.js

src/maasserver/static/js/tests/test_os_distro_select.html

src/maasserver/static/js/tests/test_os_distro_select.html

src/maasserver/static/js/tests/test_os_distro_select.js

src/maasserver/static/js/tests/test_os_distro_select.js

src/maasserver/templates/maasserver/no-bootimages-warning.html

src/maasserver/templates/maasserver/prefs.html

src/maasserver/testing/factory.py

src/maasserver/testing/osystems.py

src/maasserver/tests/test_api_boot_images.py

src/maasserver/tests/test_api_boot_source_selections.py

src/maasserver/tests/test_api_boot_sources.py

src/maasserver/tests/test_api_enlistment.py

src/maasserver/tests/test_api_node.py

src/maasserver/tests/test_api_nodegroup.py

src/maasserver/tests/test_api_nodes.py

src/maasserver/tests/test_api_pxeconfig.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_start_up.py

src/maasserver/urls_api.py

src/maasserver/views/combo.py

src/maasserver/views/tests/test_settings.py

src/maastesting/factory.py

src/maastesting/tests/test_factory.py

src/provisioningserver/boot/__init__.py

src/provisioningserver/boot/powerkvm.py

src/provisioningserver/boot/pxe.py

src/provisioningserver/boot/tests/test_boot.py

src/provisioningserver/boot/tests/test_powerkvm.py

src/provisioningserver/boot/tests/test_pxe.py

src/provisioningserver/boot/tests/test_tftppath.py

src/provisioningserver/boot/tests/test_uefi.py

src/provisioningserver/boot/tftppath.py

src/provisioningserver/boot/uefi.py

src/provisioningserver/boot_images.py

src/provisioningserver/config.py

src/provisioningserver/custom_hardware/tests/test_ucsm.py

src/provisioningserver/custom_hardware/tests/test_virsh.py

src/provisioningserver/custom_hardware/ucsm.py

src/provisioningserver/custom_hardware/utils.py

src/provisioningserver/custom_hardware/virsh.py

src/provisioningserver/dhcp/leases.py

src/provisioningserver/dhcp/leases_parser_fast.py

src/provisioningserver/dhcp/tests/test_leases_parser.py

src/provisioningserver/driver/__init__.py

src/provisioningserver/driver/tests/test_os_ubuntu.py

src/provisioningserver/import_images/boot_image_mapping.py

src/provisioningserver/import_images/boot_resources.py

src/provisioningserver/import_images/download_descriptions.py

src/provisioningserver/import_images/download_resources.py

src/provisioningserver/import_images/keyrings.py

src/provisioningserver/import_images/testing/factory.py

src/provisioningserver/import_images/tests/test_boot_image_mapping.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/import_images/tests/test_download_resources.py

src/provisioningserver/import_images/tests/test_keyrings.py

src/provisioningserver/power/tests/test_poweraction.py

src/provisioningserver/power_schema.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/tasks.py

src/provisioningserver/testing/boot_images.py

src/provisioningserver/testing/config.py

src/provisioningserver/tests/test_config.py

src/provisioningserver/tests/test_tasks.py

src/provisioningserver/tests/test_tftp.py

src/provisioningserver/tests/test_upgrade_cluster.py

src/provisioningserver/tftp.py

src/provisioningserver/upgrade_cluster.py

src/provisioningserver/utils/__init__.py

src/provisioningserver/utils/tests/test_utils.py

Older »