← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 1965.

Committer: Gavin Panella
Date: 2014-02-12 21:48:03 UTC
mfrom: (1745.2.196 maas)
Revision ID: gavin.panella@canonical.com-20140212214803-20itl9br15ynrwb8

Merge trunk, resolving many conflicts.

files added:
pkg/maas-region/maasserver/tests/test_eventloop.py

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

pkg/maas-region/maasserver/views/tests

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

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

files renamed:
docs/man/maas.8.rst => docs/man/maas-region-admin.8.rst

docs/man/maas-cli.8.rst => docs/man/maas.8.rst

man/maas.8 => man/maas-region-admin.8

man/maas-cli.8 => man/maas.8

pkg/maas-region/maasserver/tests/test_views_account.py => pkg/maas-region/maasserver/views/tests/test_account.py

pkg/maas-region/maasserver/tests/test_views_combo.py => pkg/maas-region/maasserver/views/tests/test_combo.py

pkg/maas-region/maasserver/tests/test_views.py => pkg/maas-region/maasserver/views/tests/test_general.py

pkg/maas-region/maasserver/tests/test_views_longpoll.py => pkg/maas-region/maasserver/views/tests/test_longpoll.py

pkg/maas-region/maasserver/tests/test_views_networks.py => pkg/maas-region/maasserver/views/tests/test_networks.py

pkg/maas-region/maasserver/tests/test_views_nodes.py => pkg/maas-region/maasserver/views/tests/test_nodes.py

pkg/maas-region/maasserver/tests/test_views_prefs.py => pkg/maas-region/maasserver/views/tests/test_prefs.py

pkg/maas-region/maasserver/tests/test_views_settings.py => pkg/maas-region/maasserver/views/tests/test_settings.py

pkg/maas-region/maasserver/tests/test_views_settings_clusters.py => pkg/maas-region/maasserver/views/tests/test_settings_clusters.py

pkg/maas-region/maasserver/tests/test_views_settings_commissioning_scripts.py => pkg/maas-region/maasserver/views/tests/test_settings_commissioning_scripts.py

pkg/maas-region/maasserver/tests/test_views_tags.py => pkg/maas-region/maasserver/views/tests/test_tags.py

pkg/maas-region/maasserver/tests/test_views_zones.py => pkg/maas-region/maasserver/views/tests/test_zones.py

files modified:
HACKING.txt

Makefile

docs/_templates/maas/static/css/main.css

docs/conf.py

docs/configure.rst

docs/index.rst

docs/kernel-options.rst

docs/maascli.rst

docs/man/maas-import-pxe-files.8.rst

docs/nodes.rst

docs/physical-zones.rst

docs/tags.rst

docs/troubleshooting.rst

man/maas-import-pxe-files.8

pkg/maas-cluster/etc/maas/pserv.yaml

pkg/maas-cluster/provisioningserver/config.py

pkg/maas-cluster/provisioningserver/plugin.py

pkg/maas-cluster/provisioningserver/rpc/clusterservice.py

pkg/maas-cluster/provisioningserver/rpc/tests/test_clusterservice.py

pkg/maas-cluster/provisioningserver/tests/test_config.py

pkg/maas-region/etc/maas/templates/commissioning-user-data/user_data.template

pkg/maas-region/maasserver/api.py

pkg/maas-region/maasserver/eventloop.py

pkg/maas-region/maasserver/fields.py

pkg/maas-region/maasserver/forms.py

pkg/maas-region/maasserver/middleware.py

pkg/maas-region/maasserver/rpc/regionservice.py

pkg/maas-region/maasserver/rpc/tests/test_regionservice.py

pkg/maas-region/maasserver/tests/test_api.py

pkg/maas-region/maasserver/tests/test_api_enlistment.py

pkg/maas-region/maasserver/tests/test_api_networks.py

pkg/maas-region/maasserver/tests/test_api_nodes.py

pkg/maas-region/maasserver/tests/test_forms.py

pkg/maas-region/maasserver/urls.py

services/dns/run

services/webapp/run

Show diffs side-by-side

added added

removed removed

docs/_templates/maas/static/css/main.css

docs/configure.rst

docs/kernel-options.rst

docs/maascli.rst

docs/man/maas-import-pxe-files.8.rst

docs/man/maas-region-admin.8.rst

docs/man/maas.8.rst

docs/physical-zones.rst

docs/troubleshooting.rst

man/maas-import-pxe-files.8

man/maas-region-admin.8

pkg/maas-cluster/etc/maas/pserv.yaml

pkg/maas-cluster/provisioningserver/config.py

pkg/maas-cluster/provisioningserver/plugin.py

pkg/maas-cluster/provisioningserver/rpc/clusterservice.py

pkg/maas-cluster/provisioningserver/rpc/tests/test_clusterservice.py

pkg/maas-cluster/provisioningserver/tests/test_config.py

pkg/maas-region/etc/maas/templates/commissioning-user-data/user_data.template

pkg/maas-region/maasserver/api.py

pkg/maas-region/maasserver/eventloop.py

pkg/maas-region/maasserver/fields.py

pkg/maas-region/maasserver/forms.py

pkg/maas-region/maasserver/middleware.py

pkg/maas-region/maasserver/rpc/regionservice.py

pkg/maas-region/maasserver/rpc/tests/test_regionservice.py

pkg/maas-region/maasserver/tests/test_api.py

pkg/maas-region/maasserver/tests/test_api_enlistment.py

pkg/maas-region/maasserver/tests/test_api_networks.py

pkg/maas-region/maasserver/tests/test_api_nodes.py

pkg/maas-region/maasserver/tests/test_eventloop.py

pkg/maas-region/maasserver/tests/test_forms.py

pkg/maas-region/maasserver/urls.py

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

pkg/maas-region/maasserver/views/tests/

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

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

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

services/dns/run

services/webapp/run

Older »