← Back to branch summary

~jelmer/launchpad/retry-update-node-tags

~jelmer/launchpad/retry-update-node-tags

Viewing all changes in revision 1222.

Committer: Jelmer Vernooij
Date: 2012-10-10 08:58:45 UTC
mfrom: (1218.1.26 maas)
Revision ID: jelmer@samba.org-20121010085845-3ahclel6uu5tsdd6

Merge trunk.

files added:
src/apiclient/encode_json.py

src/apiclient/tests/test_encode_json.py

src/maascli/parser.py

src/maascli/profile.py

src/maascli/tests/test_profile.py

files renamed:
src/maascli/tests/test_init.py => src/maascli/tests/test_parser.py

files modified:
buildout.cfg

contrib/preseeds_v2/enlist_userdata

etc/maas/commissioning-user-data

scripts/maas-import-ephemerals

src/apiclient/maas_client.py

src/apiclient/testing/django.py

src/apiclient/tests/test_maas_client.py

src/apiclient/tests/test_utils.py

src/apiclient/utils.py

src/maascli/__init__.py

src/maascli/api.py

src/maascli/cli.py

src/maascli/tests/test_api.py

src/maascli/tests/test_cli.py

src/maascli/tests/test_utils.py

src/maascli/utils.py

src/maasserver/api.py

src/maasserver/dns_connect.py

src/maasserver/enum.py

src/maasserver/exceptions.py

src/maasserver/models/dhcplease.py

src/maasserver/models/node.py

src/maasserver/models/node_constraint_filter.py

src/maasserver/static/css/components/search_box.css

src/maasserver/static/css/forms.css

src/maasserver/static/css/layout.css

src/maasserver/static/img/favicon.ico

src/maasserver/static/img/home.png

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/node_list.html

src/maasserver/templates/maasserver/nodegroup_confirm_delete.html

src/maasserver/templates/maasserver/nodegroup_edit.html

src/maasserver/tests/test_api.py

src/maasserver/tests/test_dhcplease.py

src/maasserver/tests/test_exceptions.py

src/maasserver/tests/test_node_constraint_filter.py

src/maasserver/tests/test_nodegroup.py

src/maasserver/tests/test_views_nodes.py

src/maasserver/tests/test_views_settings_clusters.py

src/maasserver/urls.py

src/maasserver/views/nodes.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/omshell.py

src/provisioningserver/tags.py

src/provisioningserver/tests/test_kernel_opts.py

src/provisioningserver/tests/test_omshell.py

src/provisioningserver/tests/test_tags.py

Show diffs side-by-side

added added

removed removed

contrib/preseeds_v2/enlist_userdata

etc/maas/commissioning-user-data

scripts/maas-import-ephemerals

src/apiclient/encode_json.py

src/apiclient/maas_client.py

src/apiclient/testing/django.py

src/apiclient/tests/test_encode_json.py

src/apiclient/tests/test_maas_client.py

src/apiclient/tests/test_utils.py

src/apiclient/utils.py

src/maascli/__init__.py

src/maascli/api.py

src/maascli/cli.py

src/maascli/parser.py

src/maascli/profile.py

src/maascli/tests/test_api.py

src/maascli/tests/test_cli.py

src/maascli/tests/test_parser.py

src/maascli/tests/test_profile.py

src/maascli/tests/test_utils.py

src/maascli/utils.py

src/maasserver/api.py

src/maasserver/dns_connect.py

src/maasserver/enum.py

src/maasserver/exceptions.py

src/maasserver/models/dhcplease.py

src/maasserver/models/node.py

src/maasserver/models/node_constraint_filter.py

src/maasserver/static/css/components/search_box.css

src/maasserver/static/css/forms.css

src/maasserver/static/css/layout.css

src/maasserver/static/img/favicon.ico

src/maasserver/static/img/home.png

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/node_list.html

src/maasserver/templates/maasserver/nodegroup_confirm_delete.html

src/maasserver/templates/maasserver/nodegroup_edit.html

src/maasserver/tests/test_api.py

src/maasserver/tests/test_dhcplease.py

src/maasserver/tests/test_exceptions.py

src/maasserver/tests/test_node_constraint_filter.py

src/maasserver/tests/test_nodegroup.py

src/maasserver/tests/test_views_nodes.py

src/maasserver/tests/test_views_settings_clusters.py

src/maasserver/urls.py

src/maasserver/views/nodes.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/omshell.py

src/provisioningserver/tags.py

src/provisioningserver/tests/test_kernel_opts.py

src/provisioningserver/tests/test_omshell.py

src/provisioningserver/tests/test_tags.py

Older »