← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2432.

Committer: Gavin Panella
Date: 2014-07-15 20:04:11 UTC
mfrom: (1745.2.658 maas)
Revision ID: gavin.panella@canonical.com-20140715200411-buk82e875w6hfv3i

Merge trunk r2403.

files modified:
pkg/maas-region/maasserver/api.py

pkg/maas-region/maasserver/node_constraint_filter_forms.py

pkg/maas-region/maasserver/tests/test_api_nodes.py

pkg/maas-region/maasserver/tests/test_node_constraint_filter_forms.py

Show diffs side-by-side

added added

removed removed

pkg/maas-region/maasserver/api.py

pkg/maas-region/maasserver/node_constraint_filter_forms.py

pkg/maas-region/maasserver/tests/test_api_nodes.py

pkg/maas-region/maasserver/tests/test_node_constraint_filter_forms.py

Older »