Merge ~cgrabowski/maas:backport_lp2056050_3.4 into maas:3.4
Proposed by
Christian Grabowski
Status: | Merged |
---|---|
Approved by: | Björn Tillenius |
Approved revision: | 2813fddd11a7a573d793c0746cbc47565c5712b4 |
Merge reported by: | MAAS Lander |
Merged at revision: | not available |
Proposed branch: | ~cgrabowski/maas:backport_lp2056050_3.4 |
Merge into: | maas:3.4 |
Diff against target: |
340 lines (+178/-11) 10 files modified
src/maasserver/dns/config.py (+1/-1) src/maasserver/dns/tests/test_config.py (+4/-1) src/maasserver/fields.py (+39/-0) src/maasserver/forms/domain.py (+5/-5) src/maasserver/forms/tests/test_domain.py (+24/-0) src/maasserver/migrations/maasserver/0318_add_port_to_forward_dns_servers.py (+17/-0) src/maasserver/models/forwarddnsserver.py (+12/-1) src/maasserver/tests/test_fields.py (+49/-0) src/provisioningserver/dns/tests/test_config.py (+26/-2) src/provisioningserver/templates/dns/named.conf.template (+1/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Björn Tillenius | Approve | ||
MAAS Lander | Approve | ||
Review via email: mp+462712@code.launchpad.net |
Commit message
fix: allow non-default ports for forward dns servers
To post a comment you must log in.
UNIT TESTS lp2056050_ 3.4 lp:~cgrabowski/maas/+git/maas into -b 3.4 lp:~maas-committers/maas
-b backport_
STATUS: SUCCESS 3d793c0746cbc47 565c5712b4
COMMIT: 2813fddd11a7a57