← Back to branch summary

~allenap/maas/doc-improvements

~allenap/maas/doc-improvements

Viewing all changes in revision 357.

Committer: Gavin Panella
Date: 2012-04-03 15:18:25 UTC
mfrom: (346.1.53 maas)
Revision ID: gavin.panella@canonical.com-20120403151825-54jd82orndfpwvn4

Merge trunk, resolving 1 conflict.

files added:
INSTALL.txt

contrib/snippets/maas_sudoers

docs/install.rst

etc/cron.d/maas-gc

src/maasserver/migrations/0003_rename_sshkeys.py

src/maasserver/templates/maasserver/node_confirm_delete.html

src/maasserver/templates/maasserver/prefs_add_sshkey.html

src/maasserver/templates/maasserver/prefs_confirm_delete_sshkey.html

src/maasserver/tests/data

src/maasserver/tests/data/test_dsa

src/maasserver/tests/data/test_dsa.pub

src/maasserver/tests/data/test_rsa

src/maasserver/tests/data/test_rsa.pub

src/maastesting/management/commands/tests

src/maastesting/management/commands/tests/__init__.py

src/maastesting/management/commands/tests/test_reconcile.py

files removed:
qa/checkbox

qa/checkbox/installer.txt

qa/checkbox/juju.txt

qa/checkbox/maas.txt

files modified:
HACKING.txt

Makefile

contrib/maas-http.conf

contrib/preseeds/maas.preseed

contrib/snippets/maas_client_packages

contrib/snippets/maas_preseed

docs/index.rst

docs/juju-quick-start.rst

etc/cron.d/maas-import-isos

etc/pserv.yaml

etc/txlongpoll.yaml

scripts/maas-import-isos

src/maas/development.py

src/maas/settings.py

src/maasserver/api.py

src/maasserver/exceptions.py

src/maasserver/fields.py

src/maasserver/forms.py

src/maasserver/management/commands/generate_api_doc.py

src/maasserver/management/commands/runserver.py

src/maasserver/middleware.py

src/maasserver/models.py

src/maasserver/provisioning.py

src/maasserver/static/css/forms.css

src/maasserver/static/js/node_add.js

src/maasserver/static/js/testing/testing.js

src/maasserver/static/js/tests/test_longpoll.js

src/maasserver/static/js/tests/test_node_add.js

src/maasserver/static/js/tests/test_prefs.js

src/maasserver/static/js/tests/test_utils.js

src/maasserver/templates/maasserver/node_edit.html

src/maasserver/templates/maasserver/node_list.html

src/maasserver/templates/maasserver/node_view.html

src/maasserver/templates/maasserver/prefs.html

src/maasserver/templates/maasserver/user_edit.html

src/maasserver/testing/__init__.py

src/maasserver/testing/factory.py

src/maasserver/testing/testcase.py

src/maasserver/testing/tests/test_factory.py

src/maasserver/testing/tests/test_module.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_auth.py

src/maasserver/tests/test_commands.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_middleware.py

src/maasserver/tests/test_models.py

src/maasserver/tests/test_provisioning.py

src/maasserver/tests/test_views.py

src/maasserver/urls.py

src/maasserver/views.py

src/maastesting/factory.py

src/maastesting/management/commands/reconcile.py

src/maastesting/testcase.py

src/maastesting/tests/test_factory.py

src/metadataserver/api.py

src/metadataserver/fields.py

src/metadataserver/tests/test_api.py

src/provisioningserver/api.py

src/provisioningserver/cobblercatcher.py

src/provisioningserver/cobblerclient.py

src/provisioningserver/interfaces.py

src/provisioningserver/testing/fakeapi.py

src/provisioningserver/testing/fakecobbler.py

src/provisioningserver/tests/test_api.py

src/provisioningserver/tests/test_fakecobbler.py

Show diffs side-by-side

added added

removed removed

contrib/maas-http.conf

contrib/preseeds/maas.preseed

contrib/snippets/maas_client_packages

contrib/snippets/maas_preseed

contrib/snippets/maas_sudoers

docs/install.rst@

docs/juju-quick-start.rst

etc/cron.d/maas-gc

etc/cron.d/maas-import-isos

etc/txlongpoll.yaml

qa/checkbox/installer.txt

qa/checkbox/juju.txt

qa/checkbox/maas.txt

scripts/maas-import-isos

src/maas/development.py

src/maas/settings.py

src/maasserver/api.py

src/maasserver/exceptions.py

src/maasserver/fields.py

src/maasserver/forms.py

src/maasserver/management/commands/generate_api_doc.py

src/maasserver/management/commands/runserver.py

src/maasserver/middleware.py

src/maasserver/migrations/0003_rename_sshkeys.py

src/maasserver/models.py

src/maasserver/provisioning.py

src/maasserver/static/css/forms.css

src/maasserver/static/js/node_add.js

src/maasserver/static/js/testing/testing.js

src/maasserver/static/js/tests/test_longpoll.js

src/maasserver/static/js/tests/test_node_add.js

src/maasserver/static/js/tests/test_prefs.js

src/maasserver/static/js/tests/test_utils.js

src/maasserver/templates/maasserver/node_confirm_delete.html

src/maasserver/templates/maasserver/node_edit.html

src/maasserver/templates/maasserver/node_list.html

src/maasserver/templates/maasserver/node_view.html

src/maasserver/templates/maasserver/prefs.html

src/maasserver/templates/maasserver/prefs_add_sshkey.html

src/maasserver/templates/maasserver/prefs_confirm_delete_sshkey.html

src/maasserver/templates/maasserver/user_edit.html

src/maasserver/testing/__init__.py

src/maasserver/testing/factory.py

src/maasserver/testing/testcase.py

src/maasserver/testing/tests/test_factory.py

src/maasserver/testing/tests/test_module.py

src/maasserver/tests/data/

src/maasserver/tests/data/test_dsa

src/maasserver/tests/data/test_dsa.pub

src/maasserver/tests/data/test_rsa

src/maasserver/tests/data/test_rsa.pub

src/maasserver/tests/test_api.py

src/maasserver/tests/test_auth.py

src/maasserver/tests/test_commands.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_middleware.py

src/maasserver/tests/test_models.py

src/maasserver/tests/test_provisioning.py

src/maasserver/tests/test_views.py

src/maasserver/urls.py

src/maasserver/views.py

src/maastesting/factory.py

src/maastesting/management/commands/reconcile.py

src/maastesting/management/commands/tests/

src/maastesting/management/commands/tests/__init__.py

src/maastesting/management/commands/tests/test_reconcile.py

src/maastesting/testcase.py

src/maastesting/tests/test_factory.py

src/metadataserver/api.py

src/metadataserver/fields.py

src/metadataserver/tests/test_api.py

src/provisioningserver/api.py

src/provisioningserver/cobblercatcher.py

src/provisioningserver/cobblerclient.py

src/provisioningserver/interfaces.py

src/provisioningserver/testing/fakeapi.py

src/provisioningserver/testing/fakecobbler.py

src/provisioningserver/tests/test_api.py

src/provisioningserver/tests/test_fakecobbler.py

Older »