← Back to branch summary

~jelmer/maas/tag-updating

~jelmer/maas/tag-updating

Viewing all changes in revision 1132.

Committer: Jelmer Vernooij
Date: 2012-10-03 09:16:29 UTC
mfrom: (1127.1.15 maas)
Revision ID: jelmer@samba.org-20121003091629-6219gxe32ofbfb9a

Merge lp:maas.

files added:
etc/maas/import_squashfs

scripts/maas-import-squashfs

src/maasserver/migrations/0035_add_nodegroup_cluster_name.py

src/maasserver/migrations/0036_populate_nodegroup_cluster_name.py

src/maasserver/migrations/0037_nodegroup_cluster_name_unique.py

src/maasserver/migrations/0038_nodegroupinterface_ip_range_fix.py

files modified:
etc/maas/import_pxe_files

scripts/maas-import-ephemerals

scripts/maas-import-pxe-files

setup.py

src/maascli/api.py

src/maascli/tests/test_api.py

src/maasserver/api.py

src/maasserver/dhcp_connect.py

src/maasserver/fixtures/dev_fixture.yaml

src/maasserver/forms.py

src/maasserver/models/nodegroup.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_forms.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/start_cluster_controller.py

src/provisioningserver/tests/test_kernel_opts.py

src/provisioningserver/tests/test_maas_import_pxe_files.py

src/provisioningserver/tests/test_start_cluster_controller.py

src/provisioningserver/tests/test_tftp.py

src/provisioningserver/tftp.py

Show diffs side-by-side

added added

removed removed

etc/maas/import_pxe_files

etc/maas/import_squashfs

scripts/maas-import-ephemerals

scripts/maas-import-pxe-files

scripts/maas-import-squashfs

src/maascli/api.py

src/maascli/tests/test_api.py

src/maasserver/api.py

src/maasserver/dhcp_connect.py

src/maasserver/fixtures/dev_fixture.yaml

src/maasserver/forms.py

src/maasserver/migrations/0035_add_nodegroup_cluster_name.py

src/maasserver/migrations/0036_populate_nodegroup_cluster_name.py

src/maasserver/migrations/0037_nodegroup_cluster_name_unique.py

src/maasserver/migrations/0038_nodegroupinterface_ip_range_fix.py

src/maasserver/models/nodegroup.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_forms.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/start_cluster_controller.py

src/provisioningserver/tests/test_kernel_opts.py

src/provisioningserver/tests/test_maas_import_pxe_files.py

src/provisioningserver/tests/test_start_cluster_controller.py

src/provisioningserver/tests/test_tftp.py

src/provisioningserver/tftp.py

Older »