← Back to branch summary

~rvb/maas/testin-br

~rvb/maas/testin-br

Viewing all changes in revision 1609.

Committer: Raphael Badin
Date: 2013-09-22 21:04:21 UTC
mfrom: (1606.1.28 maas)
Revision ID: raphael.badin@canonical.com-20130922210421-xym01ada3172l5f4

Merge trunk.

files added:
src/maasserver/tests/test_api_node.py

src/maasserver/tests/test_api_nodes.py

files modified:
src/apiclient/testing/django_client_proxy.py

src/maasserver/tests/test_api.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/tests/test_commissioningscript.py

src/provisioningserver/import_images/ephemerals_script.py

src/provisioningserver/import_images/tgt.py

src/provisioningserver/tags.py

src/provisioningserver/tests/test_tags.py

Show diffs side-by-side

added added

removed removed

src/apiclient/testing/django_client_proxy.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_api_node.py

src/maasserver/tests/test_api_nodes.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/tests/test_commissioningscript.py

src/provisioningserver/import_images/ephemerals_script.py

src/provisioningserver/import_images/tgt.py

src/provisioningserver/tags.py

src/provisioningserver/tests/test_tags.py

Older »