~smoser/ubuntu/trusty/maas/lp-1172566

« back to all changes in this revision

Viewing changes to src/provisioningserver/import_images/boot_resources.py

Committer: Package Import Robot
Author(s): Andres Rodriguez
Date: 2014-04-03 13:45:02 UTC
mto: This revision was merged to the branch mainline in revision 58.
Revision ID: package-import@ubuntu.com-20140403134502-8a6wvuqwyuekufh0

Tags: upstream-1.5+bzr2227

Import upstream version 1.5+bzr2227

files added:
src/maasserver/templates/maasserver/cluster_listing.html

src/maasserver/templates/maasserver/cluster_listing_head.html

src/maasserver/templates/maasserver/cluster_listing_row.html

src/maasserver/templates/maasserver/logout_confirm.html

src/maasserver/views/clusters.py

src/maasserver/views/tests/test_clusters.py

files removed:
src/maasserver/templates/maasserver/settings_cluster_listing.html

src/maasserver/templates/maasserver/settings_cluster_listing_row.html

src/maasserver/views/settings_clusters.py

src/maasserver/views/tests/test_settings_clusters.py

src/provisioningserver/tests/test_maas_import_pxe_files.py

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

etc/maas/templates/power/sm15k.template

man/maas-import-pxe-files.8

man/maas-region-admin.8

man/maas.8

src/apiclient/multipart.py

src/apiclient/tests/test_multipart.py

src/maascli/api.py

src/maascli/tests/test_api.py

src/maasserver/api.py

src/maasserver/forms.py

src/maasserver/forms_settings.py

src/maasserver/locks.py

src/maasserver/models/config.py

src/maasserver/models/network.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/sshkey.py

src/maasserver/models/tests/test_nodegroup.py

src/maasserver/models/tests/test_nodegroupinterface.py

src/maasserver/models/tests/test_sshkey.py

src/maasserver/node_action.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/templates/maasserver/base.html

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

src/maasserver/templates/maasserver/nodegroup_confirm_delete.html

src/maasserver/templates/maasserver/nodegroup_edit.html

src/maasserver/templates/maasserver/settings.html

src/maasserver/tests/test_api.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_node_action.py

src/maasserver/urls.py

src/maasserver/utils/dblocks.py

src/maasserver/views/account.py

src/maasserver/views/settings.py

src/maasserver/views/tests/test_account.py

src/maasserver/views/tests/test_boot_image_list.py

src/maasserver/views/tests/test_settings.py

src/provisioningserver/__main__.py

src/provisioningserver/boot/install_bootloader.py

src/provisioningserver/boot/tests/test_install_bootloader.py

src/provisioningserver/boot/tests/test_tftppath.py

src/provisioningserver/boot/tftppath.py

src/provisioningserver/custom_hardware/seamicro.py

src/provisioningserver/custom_hardware/tests/test_seamicro.py

src/provisioningserver/dhcp/config.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/import_images/boot_resources.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/tasks.py

src/provisioningserver/tests/test_tasks.py

src/provisioningserver/utils/tests/test_registry.py

Show diffs side-by-side

added added

removed removed

src/provisioningserver/import_images/boot_resources.py

179

"Merging boot resource for %s/%s/%s/%s.",

180

arch, subarch, release, label)

181

boot_resource = boot2[arch][subarch][release][label]

182

boot1[arch][subarch][release][label] = boot_resource

183

182

# Do not override an existing entry with the same

184

183

# arch/subarch/release/label: the first entry found takes

185

184

# precedence.

Older »