← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2087.

Committer: Gavin Panella
Date: 2014-03-30 21:32:31 UTC
mfrom: (1745.2.317 maas)
Revision ID: gavin.panella@canonical.com-20140330213231-pilyjjhfeudg3heu

Merge trunk r2062, resolving minor conflicts.

files modified:
pkg/maas-region/maasserver/static/js/node_add.js

pkg/maas-region/maasserver/static/js/power_parameters.js

pkg/maas-region/maasserver/static/js/tests/test_node_add.html

pkg/maas-region/maasserver/static/js/tests/test_node_add.js

pkg/maas-region/maasserver/static/js/tests/test_power_parameters.html

pkg/maas-region/maasserver/static/js/tests/test_power_parameters.js

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

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

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

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

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

Show diffs side-by-side

added added

removed removed

pkg/maas-region/maasserver/static/js/node_add.js

pkg/maas-region/maasserver/static/js/power_parameters.js

pkg/maas-region/maasserver/static/js/tests/test_node_add.html

pkg/maas-region/maasserver/static/js/tests/test_node_add.js

pkg/maas-region/maasserver/static/js/tests/test_power_parameters.html

pkg/maas-region/maasserver/static/js/tests/test_power_parameters.js

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

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

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

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

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

Older »