← Back to branch summary

~ltrager/maas/remove_tgt

~ltrager/maas/remove_tgt

« back to all changes in this revision

Viewing changes to src/maasserver/models/config.py

Committer: Lee Trager
Date: 2017-06-16 14:58:15 UTC
mfrom: (6086.1.1 rootfs_over_http)
Revision ID: lee.trager@canonical.com-20170616145815-yn4st7207mdzp0k8

Merge trunk

files added:
src/maasserver/static/js/angular/3rdparty/vs-repeat.js

src/provisioningserver/drivers/osystem/rhel.py

src/provisioningserver/drivers/osystem/tests/test_rhel.py

files modified:
docs/development/notifications.rst

src/apiclient/testing/django.py

src/maasserver/api/doc_handler.py

src/maasserver/api/tests/test_doc.py

src/maasserver/api/tests/test_interfaces.py

src/maasserver/api/tests/test_maas.py

src/maasserver/compose_preseed.py

src/maasserver/djangosettings/settings.py

src/maasserver/forms/__init__.py

src/maasserver/forms/interface.py

src/maasserver/forms/settings.py

src/maasserver/forms/tests/test_interface.py

src/maasserver/models/config.py

src/maasserver/models/largefile.py

src/maasserver/models/tests/test_blockdevice.py

src/maasserver/models/tests/test_physicalblockdevice.py

src/maasserver/preseed.py

src/maasserver/proxyconfig.py

src/maasserver/service_monitor.py

src/maasserver/static/js/angular/controllers/fabric_details.js

src/maasserver/static/js/angular/controllers/tests/test_fabric_details.js

src/maasserver/static/js/angular/maas.js

src/maasserver/static/partials/dashboard.html

src/maasserver/static/partials/fabric-details.html

src/maasserver/static/partials/machines-table.html

src/maasserver/static/partials/networks-list.html

src/maasserver/static/partials/node-events.html

src/maasserver/static/partials/nodes-list.html

src/maasserver/static/partials/pods-list.html

src/maasserver/templates/maasserver/js-conf.html

src/maasserver/tests/test_compose_preseed.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_proxyconfig.py

src/maasserver/tests/test_service_monitor.py

src/maasserver/triggers/system.py

src/maasserver/triggers/testing.py

src/maasserver/triggers/tests/test_init.py

src/maasserver/triggers/tests/test_system_listener.py

src/maasserver/urls.py

src/maasserver/utils/__init__.py

src/maasserver/utils/osystems.py

src/maasserver/utils/tests/test_osystems.py

src/maasserver/utils/tests/test_views.py

src/maasserver/utils/views.py

src/maasserver/views/account.py

src/maasserver/views/combo.py

src/maasserver/views/prefs.py

src/maasserver/views/settings.py

src/maasserver/views/tests/test_general.py

src/maasserver/websockets/handlers/tests/test_machine.py

src/provisioningserver/drivers/osystem/__init__.py

src/provisioningserver/drivers/osystem/centos.py

src/provisioningserver/drivers/osystem/tests/test_centos.py

src/provisioningserver/templates/proxy/maas-proxy.conf.template

src/provisioningserver/utils/service_monitor.py

src/provisioningserver/utils/tests/test_service_monitor.py

Show diffs side-by-side

added added

removed removed

src/maasserver/models/config.py

69

69

'default_osystem': DEFAULT_OS.name,

70

70

'default_distro_series': DEFAULT_OS.get_default_release(),

71

71

'enable_http_proxy': True,

72

'use_peer_proxy': False,

72

73

'http_proxy': None,

73

74

'upstream_dns': None,

74

75

'dnssec_validation': "auto",

Older »