← Back to branch summary

~jameinel/maas/land-kernel-opts-in-trunk

~jameinel/maas/land-kernel-opts-in-trunk

Viewing all changes in revision 1334.

Committer: John Arbash Meinel
Date: 2012-11-08 06:34:48 UTC
mfrom: (1264.2.27 1.2)
Revision ID: john@arbash-meinel.com-20121108063448-8yaj5b3nzhum9wfj

Merge 1.2 into trunk, resolve conflicts.

files added:
src/maasserver/migrations/0045_add_tag_kernel_opts.py

files modified:
src/maasserver/api.py

src/maasserver/forms.py

src/maasserver/models/node.py

src/maasserver/models/tag.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_node.py

src/maasserver/tests/test_tag.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/tests/test_kernel_opts.py

Show diffs side-by-side

added added

removed removed

src/maasserver/api.py

src/maasserver/forms.py

src/maasserver/migrations/0045_add_tag_kernel_opts.py

src/maasserver/models/node.py

src/maasserver/models/tag.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_node.py

src/maasserver/tests/test_tag.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/tests/test_kernel_opts.py

Older »