← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 1958.

Committer: Gavin Panella
Date: 2014-01-31 11:56:39 UTC
mfrom: (1745.2.127 maas)
Revision ID: gavin.panella@canonical.com-20140131115639-ufufs3gna0wuz93h

Merge trunk, resolving a few small conflicts.

files added:
services.txt

files modified:
docs/cluster-configuration.rst

docs/configure.rst

pkg/common/Makefile

pkg/maas-cluster/etc/maas/templates/dhcp/dhcpd.conf.template

pkg/maas-cluster/etc/maas/templates/power/amt.template

pkg/maas-cluster/provisioningserver/dhcp/config.py

pkg/maas-cluster/provisioningserver/dhcp/detect.py

pkg/maas-cluster/provisioningserver/dhcp/tests/test_config.py

pkg/maas-cluster/provisioningserver/dhcp/tests/test_detect.py

pkg/maas-cluster/provisioningserver/dhcp/tests/test_writer.py

pkg/maas-cluster/provisioningserver/dhcp/writer.py

pkg/maas-cluster/provisioningserver/import_images/ephemerals_script.py

pkg/maas-cluster/provisioningserver/tests/test_tasks.py

pkg/maas-region/configure.py

pkg/maas-region/etc/maas/preseeds/curtin_userdata

pkg/maas-region/maas/settings.py

pkg/maas-region/maasserver/dhcp.py

pkg/maas-region/maasserver/dns.py

pkg/maas-region/maasserver/fields.py

pkg/maas-region/maasserver/forms.py

pkg/maas-region/maasserver/models/node.py

pkg/maas-region/maasserver/models/nodegroup.py

pkg/maas-region/maasserver/models/nodegroupinterface.py

pkg/maas-region/maasserver/models/tests/test_nodegroup.py

pkg/maas-region/maasserver/models/tests/test_nodegroupinterface.py

pkg/maas-region/maasserver/preseed.py

pkg/maas-region/maasserver/testing/factory.py

pkg/maas-region/maasserver/tests/test_api.py

pkg/maas-region/maasserver/tests/test_api_register.py

pkg/maas-region/maasserver/tests/test_dhcp.py

pkg/maas-region/maasserver/tests/test_dns.py

pkg/maas-region/maasserver/tests/test_fields.py

pkg/maas-region/maasserver/tests/test_forms.py

pkg/maas-region/maasserver/tests/test_preseed.py

pkg/maas-region/maasserver/tests/test_views_settings_clusters.py

pkg/maas-region/maasserver/utils/tests/test_utils.py

pkg/maas-region/metadataserver/models/commissioningscript.py

pkg/maas-region/metadataserver/models/tests/test_commissioningscript.py

pkg/maas-region/packages.txt

pkg/maas-region/setup.py

pkg/maas-testing/configure.py

pkg/maas-testing/packages.txt

pkg/maas-testing/setup.py

Show diffs side-by-side

added added

removed removed

docs/cluster-configuration.rst

docs/configure.rst

pkg/common/Makefile

pkg/maas-cluster/etc/maas/templates/dhcp/dhcpd.conf.template

pkg/maas-cluster/etc/maas/templates/power/amt.template

pkg/maas-cluster/provisioningserver/dhcp/config.py

pkg/maas-cluster/provisioningserver/dhcp/detect.py

pkg/maas-cluster/provisioningserver/dhcp/tests/test_config.py

pkg/maas-cluster/provisioningserver/dhcp/tests/test_detect.py

pkg/maas-cluster/provisioningserver/dhcp/tests/test_writer.py

pkg/maas-cluster/provisioningserver/dhcp/writer.py

pkg/maas-cluster/provisioningserver/import_images/ephemerals_script.py

pkg/maas-cluster/provisioningserver/tests/test_tasks.py

pkg/maas-region/configure.py

pkg/maas-region/etc/maas/preseeds/curtin_userdata

pkg/maas-region/maas/settings.py

pkg/maas-region/maasserver/dhcp.py

pkg/maas-region/maasserver/dns.py

pkg/maas-region/maasserver/fields.py

pkg/maas-region/maasserver/forms.py

pkg/maas-region/maasserver/models/node.py

pkg/maas-region/maasserver/models/nodegroup.py

pkg/maas-region/maasserver/models/nodegroupinterface.py

pkg/maas-region/maasserver/models/tests/test_nodegroup.py

pkg/maas-region/maasserver/models/tests/test_nodegroupinterface.py

pkg/maas-region/maasserver/preseed.py

pkg/maas-region/maasserver/testing/factory.py

pkg/maas-region/maasserver/tests/test_api.py

pkg/maas-region/maasserver/tests/test_api_register.py

pkg/maas-region/maasserver/tests/test_dhcp.py

pkg/maas-region/maasserver/tests/test_dns.py

pkg/maas-region/maasserver/tests/test_fields.py

pkg/maas-region/maasserver/tests/test_forms.py

pkg/maas-region/maasserver/tests/test_preseed.py

pkg/maas-region/maasserver/tests/test_views_settings_clusters.py

pkg/maas-region/maasserver/utils/tests/test_utils.py

pkg/maas-region/metadataserver/models/commissioningscript.py

pkg/maas-region/metadataserver/models/tests/test_commissioningscript.py

pkg/maas-region/packages.txt

pkg/maas-region/setup.py

pkg/maas-testing/configure.py

pkg/maas-testing/packages.txt

pkg/maas-testing/setup.py

Older »