← Back to branch summary

~allenap/maas/pass-addresses-to-tftp-backend

~allenap/maas/pass-addresses-to-tftp-backend

Viewing all changes in revision 1305.

Committer: Gavin Panella
Date: 2012-10-29 14:47:12 UTC
mfrom: (1302.1.10 maas)
Revision ID: gavin.panella@canonical.com-20121029144712-rx4sex6pku09jg2t

Merge trunk.

files added:
docs/man

docs/man/maas-cli.8.rst

src/maasserver/management/commands/write_dns_config.py

src/maasserver/migrations/0039_add_filestorage_content.py

src/maasserver/migrations/0040_make_filestorage_data_not_null.py

src/maasserver/migrations/0041_remove_filestorage_data.py

src/maasserver/tests/test_commands_write_dns_config.py

files removed:
src/maasserver/management/commands/gc.py

files modified:
Makefile

docs/conf.py

docs/maascli.rst

docs/tags.rst

etc/cron.d/maas-gc

etc/maas/import_pxe_files

setup.py

src/maasserver/api.py

src/maasserver/components.py

src/maasserver/management/commands/set_up_dns.py

src/maasserver/models/filestorage.py

src/maasserver/templates/maasserver/nodegroup_edit.html

src/maasserver/templates/maasserver/settings_cluster_listing_row.html

src/maasserver/testing/factory.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_commands.py

src/maasserver/tests/test_filestorage.py

src/metadataserver/api.py

src/provisioningserver/tags.py

Show diffs side-by-side

added added

removed removed

docs/maascli.rst

docs/man/maas-cli.8.rst

etc/cron.d/maas-gc

etc/maas/import_pxe_files

src/maasserver/api.py

src/maasserver/components.py

src/maasserver/management/commands/gc.py

src/maasserver/management/commands/set_up_dns.py

src/maasserver/management/commands/write_dns_config.py

src/maasserver/migrations/0039_add_filestorage_content.py

src/maasserver/migrations/0040_make_filestorage_data_not_null.py

src/maasserver/migrations/0041_remove_filestorage_data.py

src/maasserver/models/filestorage.py

src/maasserver/templates/maasserver/nodegroup_edit.html

src/maasserver/templates/maasserver/settings_cluster_listing_row.html

src/maasserver/testing/factory.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_commands.py

src/maasserver/tests/test_commands_write_dns_config.py

src/maasserver/tests/test_filestorage.py

src/metadataserver/api.py

src/provisioningserver/tags.py

Older »