← Back to branch summary

~allenap/maas/pserv-django

~allenap/maas/pserv-django

Viewing all changes in revision 114.

Committer: Gavin Panella
Date: 2012-02-17 21:56:08 UTC
mfrom: (112.2.37 maas)
Revision ID: gavin.panella@canonical.com-20120217215608-rmdae3r362epg2bx

Merge trunk, resolving conflicts.

files added:
LICENSE

etc

etc/pserv.yaml

src/maasserver/exceptions.py

src/maasserver/static/img/delete.png

src/maasserver/static/img/edit.png

src/maasserver/static/img/yes.png

src/maasserver/templates/maasserver/settings.html

src/maasserver/templates/maasserver/user_add.html

src/maasserver/templates/maasserver/user_confirm_delete.html

src/maasserver/templates/maasserver/user_edit.html

src/maasserver/templates/maasserver/user_view.html

src/maasserver/testing/tests

src/maasserver/testing/tests/__init__.py

src/maasserver/testing/tests/test_module.py

src/maasserver/tests/test_middleware.py

src/metadataserver/fixtures

src/metadataserver/fixtures/initial_data.yaml

src/metadataserver/nodeinituser.py

src/metadataserver/tests/__init__.py

src/metadataserver/tests/test_models.py

src/metadataserver/tests/test_nodeinituser.py

files modified:
HACKING.txt

Makefile

buildout.cfg

src/maas/development.py

src/maas/settings.py

src/maasserver/api.py

src/maasserver/fixtures/dev_fixture.yaml

src/maasserver/forms.py

src/maasserver/management/commands/generate_api_doc.py

src/maasserver/middleware.py

src/maasserver/models.py

src/maasserver/provisioning.py

src/maasserver/static/css/modifiers.css

src/maasserver/static/js/node_add.js

src/maasserver/static/js/node_views.js

src/maasserver/static/js/prefs.js

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

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

src/maasserver/static/js/tests/test_node_views.js

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

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

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/node_list.html

src/maasserver/templates/maasserver/prefs.html

src/maasserver/testing/__init__.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_auth.py

src/maasserver/tests/test_macaddressfield.py

src/maasserver/tests/test_models.py

src/maasserver/tests/test_provisioning.py

src/maasserver/tests/test_runserver.py

src/maasserver/tests/test_views.py

src/maasserver/urls.py

src/maasserver/views.py

src/metadataserver/api.py

src/metadataserver/models.py

src/metadataserver/tests/test_api.py

src/metadataserver/urls.py

src/provisioningserver/api.py

src/provisioningserver/cobblerclient.py

src/provisioningserver/interfaces.py

src/provisioningserver/plugin.py

src/provisioningserver/testing/amqpclient.py

src/provisioningserver/testing/fakeapi.py

src/provisioningserver/testing/fakecobbler.py

src/provisioningserver/tests/__init__.py

src/provisioningserver/tests/test_api.py

src/provisioningserver/tests/test_cobblersession.py

src/provisioningserver/tests/test_fakecobbler.py

src/provisioningserver/tests/test_plugin.py

templates/module.js

utilities/maasdb

versions.cfg

Show diffs side-by-side

added added

removed removed

src/maas/development.py

src/maas/settings.py

src/maasserver/api.py

src/maasserver/exceptions.py

src/maasserver/fixtures/dev_fixture.yaml

src/maasserver/forms.py

src/maasserver/management/commands/generate_api_doc.py

src/maasserver/middleware.py

src/maasserver/models.py

src/maasserver/provisioning.py

src/maasserver/static/css/modifiers.css

src/maasserver/static/img/delete.png

src/maasserver/static/img/edit.png

src/maasserver/static/img/yes.png

src/maasserver/static/js/node_add.js

src/maasserver/static/js/node_views.js

src/maasserver/static/js/prefs.js

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

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

src/maasserver/static/js/tests/test_node_views.js

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

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

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/node_list.html

src/maasserver/templates/maasserver/prefs.html

src/maasserver/templates/maasserver/settings.html

src/maasserver/templates/maasserver/user_add.html

src/maasserver/templates/maasserver/user_confirm_delete.html

src/maasserver/templates/maasserver/user_edit.html

src/maasserver/templates/maasserver/user_view.html

src/maasserver/testing/__init__.py

src/maasserver/testing/factory.py

src/maasserver/testing/tests/

src/maasserver/testing/tests/__init__.py

src/maasserver/testing/tests/test_module.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_auth.py

src/maasserver/tests/test_macaddressfield.py

src/maasserver/tests/test_middleware.py

src/maasserver/tests/test_models.py

src/maasserver/tests/test_provisioning.py

src/maasserver/tests/test_runserver.py

src/maasserver/tests/test_views.py

src/maasserver/urls.py

src/maasserver/views.py

src/metadataserver/api.py

src/metadataserver/fixtures/

src/metadataserver/fixtures/initial_data.yaml

src/metadataserver/models.py

src/metadataserver/nodeinituser.py

src/metadataserver/tests/__init__.py

src/metadataserver/tests/test_api.py

src/metadataserver/tests/test_models.py

src/metadataserver/tests/test_nodeinituser.py

src/metadataserver/urls.py

src/provisioningserver/api.py

src/provisioningserver/cobblerclient.py

src/provisioningserver/interfaces.py

src/provisioningserver/plugin.py

src/provisioningserver/testing/amqpclient.py

src/provisioningserver/testing/fakeapi.py

src/provisioningserver/testing/fakecobbler.py

src/provisioningserver/tests/__init__.py

src/provisioningserver/tests/test_api.py

src/provisioningserver/tests/test_cobblersession.py

src/provisioningserver/tests/test_fakecobbler.py

src/provisioningserver/tests/test_plugin.py

templates/module.js

utilities/maasdb

Older »