← Back to branch summary

~jtv/maas/1.2-bug-1069734

~jtv/maas/1.2-bug-1069734

Viewing all changes in revision 1266.

Committer: Julian Edwards
Date: 2012-10-17 05:20:13 UTC
Revision ID: julian.edwards@canonical.com-20121017052013-tq7m5voj2ux40nuw

merge r1275 from trunk

files modified:
src/maasserver/templates/maasserver/node_list.html

src/maasserver/templates/maasserver/pagination.html

src/maasserver/tests/test_views.py

src/maasserver/tests/test_views_nodes.py

src/maasserver/views/__init__.py

src/maasserver/views/nodes.py

Show diffs side-by-side

added added

removed removed

src/maasserver/templates/maasserver/node_list.html

src/maasserver/templates/maasserver/pagination.html

src/maasserver/tests/test_views.py

src/maasserver/tests/test_views_nodes.py

src/maasserver/views/__init__.py

src/maasserver/views/nodes.py

Older »