← Back to branch summary

~lutostag/ubuntu/trusty/maas/1.5.4

~lutostag/ubuntu/trusty/maas/1.5.4

« back to all changes in this revision

Viewing changes to src/provisioningserver/tests/test_config.py

Committer: Package Import Robot
Author(s): Andres Rodriguez
Date: 2014-02-15 12:08:23 UTC
mto: This revision was merged to the branch mainline in revision 48.
Revision ID: package-import@ubuntu.com-20140215120823-u7dkitfy0h8tbruh

Tags: upstream-1.5+bzr1948

Import upstream version 1.5+bzr1948

files added:
docs/man/maas-region-admin.8.rst

docs/media/add-network.png

docs/networks.rst

man/maas-region-admin.8

src/maasserver/tests/test_api_network.py

src/maasserver/tests/test_api_networks.py

src/maasserver/tests/test_eventloop.py

src/maasserver/views/rpc.py

src/maasserver/views/tests

src/maasserver/views/tests/__init__.py

src/maasserver/views/tests/test_account.py

src/maasserver/views/tests/test_combo.py

src/maasserver/views/tests/test_general.py

src/maasserver/views/tests/test_longpoll.py

src/maasserver/views/tests/test_networks.py

src/maasserver/views/tests/test_nodes.py

src/maasserver/views/tests/test_prefs.py

src/maasserver/views/tests/test_rpc.py

src/maasserver/views/tests/test_settings.py

src/maasserver/views/tests/test_settings_clusters.py

src/maasserver/views/tests/test_settings_commissioning_scripts.py

src/maasserver/views/tests/test_tags.py

src/maasserver/views/tests/test_zones.py

files removed:
docs/man/maas-cli.8.rst

man/maas-cli.8

src/maasserver/tests/test_views.py

src/maasserver/tests/test_views_account.py

src/maasserver/tests/test_views_combo.py

src/maasserver/tests/test_views_longpoll.py

src/maasserver/tests/test_views_networks.py

src/maasserver/tests/test_views_nodes.py

src/maasserver/tests/test_views_prefs.py

src/maasserver/tests/test_views_settings.py

src/maasserver/tests/test_views_settings_clusters.py

src/maasserver/tests/test_views_settings_commissioning_scripts.py

src/maasserver/tests/test_views_tags.py

src/maasserver/tests/test_views_zones.py

files modified:
HACKING.txt

Makefile

buildout.cfg

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

docs/cluster-configuration.rst

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/man/maas.8.rst

docs/nodes.rst

docs/physical-zones.rst

docs/tags.rst

docs/troubleshooting.rst

etc/maas/pserv.yaml

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

etc/maas/templates/power/amt.template

man/maas-import-pxe-files.8

man/maas.8

required-packages/base

services/dns/run

services/pserv/run

services/webapp/run

src/maas/demo.py

src/maas/settings.py

src/maascli/tests/test_integration.py

src/maasserver/api.py

src/maasserver/api_support.py

src/maasserver/eventloop.py

src/maasserver/fields.py

src/maasserver/forms.py

src/maasserver/middleware.py

src/maasserver/models/network.py

src/maasserver/models/node.py

src/maasserver/models/tests/test_network.py

src/maasserver/node_constraint_filter_forms.py

src/maasserver/power_parameters.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/templates/maasserver/network_detail.html

src/maasserver/templates/maasserver/network_list.html

src/maasserver/templates/maasserver/zone_detail.html

src/maasserver/templates/maasserver/zone_list.html

src/maasserver/tests/test_api.py

src/maasserver/tests/test_api_enlistment.py

src/maasserver/tests/test_api_nodes.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/tests/test_power_parameters.py

src/maasserver/urls.py

src/maasserver/urls_api.py

src/maasserver/views/combo.py

src/maastesting/factory.py

src/maastesting/tests/test_factory.py

src/provisioningserver/config.py

src/provisioningserver/dhcp/detect.py

src/provisioningserver/dhcp/tests/test_detect.py

src/provisioningserver/enum.py

src/provisioningserver/plugin.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/tasks.py

src/provisioningserver/tests/test_config.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/tests/test_tasks.py

src/provisioningserver/tests/test_tftp.py

src/provisioningserver/tftp.py

versions.cfg

Show diffs side-by-side

added added

removed removed

src/provisioningserver/tests/test_config.py

147

147

'directory': '',

148

148

'reporter': '',

149

149

},

150

'rpc': {'port': 5248},

150

'rpc': {},

151

151

'tftp': {

152

152

'generator': 'http://localhost/MAAS/api/1.0/pxeconfig/',

153

153

'port': 69,

Older »