Merge lp:~rvb/maas/maas-forwarders into lp:~maas-committers/maas/trunk
Proposed by
Raphaël Badin
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Raphaël Badin | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 4062 | ||||
Proposed branch: | lp:~rvb/maas/maas-forwarders | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
176 lines (+77/-6) 5 files modified
src/maasserver/dns/tests/test_config.py (+4/-3) src/maasserver/fields.py (+25/-1) src/maasserver/forms_settings.py (+3/-2) src/maasserver/tests/test_fields.py (+37/-0) src/maasserver/tests/test_forms_settings.py (+8/-0) |
||||
To merge this branch: | bzr merge lp:~rvb/maas/maas-forwarders | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mike Pontillo (community) | Approve | ||
Review via email: mp+263557@code.launchpad.net |
Commit message
upstream_dns: accept a list of forwarders (and not just *one* forwarder).
Description of the change
This changes only the config form, the backend (in trunk) already supports space-separated IP addresses.
Tested in my lab.
To post a comment you must log in.
Looks good to me. Thanks for fixing this!