← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 1980.

Committer: Gavin Panella
Date: 2014-03-30 21:14:44 UTC
mfrom: (1745.2.210 maas)
Revision ID: gavin.panella@canonical.com-20140330211444-80ai3d9hb7relf6h

Merge trunk r1955, resolving minor conflicts.

files added:
pkg/maas-region/maasserver/templates/metadataserver

pkg/maas-region/maasserver/templates/metadataserver/nodecommissionresult.html

pkg/maas-region/maasserver/templates/metadataserver/nodecommissionresult_list.html

pkg/maas-region/maasserver/views/nodecommissionresult.py

pkg/maas-region/maasserver/views/tests/test_nodecommissionresults.py

files modified:
pkg/maas-region/maasserver/templates/maasserver/node_view.html

pkg/maas-region/maasserver/urls.py

pkg/maas-region/maasserver/views/nodes.py

pkg/maas-region/maasserver/views/tests/test_nodes.py

pkg/maas-region/metadataserver/models/nodecommissionresult.py

pkg/maas-region/metadataserver/models/tests/test_nodecommissionresult.py

pkg/maas-testing/maastesting/factory.py

Show diffs side-by-side

added added

removed removed

pkg/maas-region/maasserver/templates/maasserver/node_view.html

pkg/maas-region/maasserver/templates/metadataserver/

pkg/maas-region/maasserver/templates/metadataserver/nodecommissionresult.html

pkg/maas-region/maasserver/templates/metadataserver/nodecommissionresult_list.html

pkg/maas-region/maasserver/urls.py

pkg/maas-region/maasserver/views/nodecommissionresult.py

pkg/maas-region/maasserver/views/nodes.py

pkg/maas-region/maasserver/views/tests/test_nodecommissionresults.py

pkg/maas-region/maasserver/views/tests/test_nodes.py

pkg/maas-region/metadataserver/models/nodecommissionresult.py

pkg/maas-region/metadataserver/models/tests/test_nodecommissionresult.py

pkg/maas-testing/maastesting/factory.py

Older »