← Back to branch summary

~allenap/maas/consolidate-namespace-metadataserver

~allenap/maas/consolidate-namespace-metadataserver

Viewing all changes in revision 550.2.55.

Committer: Gavin Panella
Date: 2012-05-23 11:20:09 UTC
mfrom: (576 maas)
mto: This revision was merged to the branch mainline in revision 594.
Revision ID: gavin.panella@canonical.com-20120523112009-lspkzd3h64jdsu8q

Merge trunk.

files added:
etc/celeryconfig.py

services/celeryd

services/celeryd/down

services/celeryd/run

services/database

services/database/down

services/database/run

src/maasserver/management/commands/dbshell.py

src/maasserver/models/filestorage.py

src/maasserver/testing/database.py

src/maasserver/tests/test_filestorage.py

src/maastesting/celery.py

src/maastesting/tests/test_celery.py

src/provisioningserver/power

src/provisioningserver/power/__init__.py

src/provisioningserver/power/poweraction.py

src/provisioningserver/power/templates

src/provisioningserver/power/templates/ether_wake.template

src/provisioningserver/power/tests

src/provisioningserver/power/tests/test_poweraction.py

src/provisioningserver/tasks.py

src/provisioningserver/tests/test_tasks.py

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

src/maasserver/management/commands/query.py

utilities/maasdb

files modified:
.bzrignore

HACKING.txt

Makefile

buildout.cfg

qa/scripts/prepare-for-juju-with-vdenv

src/maas/demo.py

src/maas/development.py

src/maasserver/models/__init__.py

src/maasserver/static/js/morph.js

src/maasserver/static/js/node_views.js

src/maasserver/static/js/nodes_chart.js

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

src/maasserver/static/js/tests/test_morph.js

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

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

src/maasserver/tests/test_api.py

src/maasserver/tests/test_models.py

src/maasserver/tests/test_views_nodes.py

src/maastesting/runner.py

src/provisioningserver/api.py

src/provisioningserver/enum.py

src/provisioningserver/tests/test_api.py

versions.cfg

Show diffs side-by-side

added added

removed removed

etc/celeryconfig.py

qa/scripts/prepare-for-juju-with-vdenv

services/celeryd/

services/celeryd/down

services/celeryd/run

services/database/

services/database/down

services/database/run

src/maas/demo.py

src/maas/development.py

src/maasserver/management/commands/dbshell.py

src/maasserver/management/commands/deletedb.py

src/maasserver/management/commands/query.py

src/maasserver/models/__init__.py

src/maasserver/models/filestorage.py

src/maasserver/static/js/morph.js

src/maasserver/static/js/node_views.js

src/maasserver/static/js/nodes_chart.js

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

src/maasserver/static/js/tests/test_morph.js

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

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

src/maasserver/testing/database.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_filestorage.py

src/maasserver/tests/test_models.py

src/maasserver/tests/test_views_nodes.py

src/maastesting/celery.py

src/maastesting/runner.py

src/maastesting/tests/test_celery.py

src/provisioningserver/api.py

src/provisioningserver/enum.py

src/provisioningserver/power/

src/provisioningserver/power/__init__.py

src/provisioningserver/power/poweraction.py

src/provisioningserver/power/templates/

src/provisioningserver/power/templates/ether_wake.template

src/provisioningserver/power/tests/

src/provisioningserver/power/tests/test_poweraction.py

src/provisioningserver/tasks.py

src/provisioningserver/tests/test_api.py

src/provisioningserver/tests/test_tasks.py

utilities/maasdb

Older »