← Back to branch summary

~blake-rouse/maas/architecture-plugins

~blake-rouse/maas/architecture-plugins

Viewing all changes in revision 2316.

Committer: Blake Rouse
Date: 2014-05-14 16:45:38 UTC
mfrom: (2314.1.6 maas)
Revision ID: blake.rouse@canonical.com-20140514164538-cbi7hbxnrq24gaf3

Merge trunk

files added:
src/maasserver/migrations/0077_remove_null_for_bootsourceselection_release.py

src/maasserver/migrations/0078_add_osystem_to_node.py

files modified:
docs/cluster-configuration.rst

docs/orientation.rst

etc/maas/templates/power/virsh.template

src/maasserver/forms.py

src/maasserver/models/node.py

src/maasserver/tests/test_api_nodes.py

Show diffs side-by-side

added added

removed removed

docs/cluster-configuration.rst

docs/orientation.rst

etc/maas/templates/power/virsh.template

src/maasserver/forms.py

src/maasserver/migrations/0077_remove_null_for_bootsourceselection_release.py

src/maasserver/migrations/0078_add_osystem_to_node.py

src/maasserver/models/node.py

src/maasserver/tests/test_api_nodes.py

Older »