Merge lp://staging/~mpontillo/maas/ntp-issues--bug-1695083 into lp://staging/~maas-committers/maas/trunk
Proposed by
Mike Pontillo
| Status: | Merged |
|---|---|
| Approved by: | Mike Pontillo |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 6073 |
| Proposed branch: | lp://staging/~mpontillo/maas/ntp-issues--bug-1695083 |
| Merge into: | lp://staging/~maas-committers/maas/trunk |
| Diff against target: |
85 lines (+51/-7) 2 files modified
src/maasserver/dhcp.py (+24/-7) src/maasserver/tests/test_dhcp.py (+27/-0) |
| To merge this branch: | bzr merge lp://staging/~mpontillo/maas/ntp-issues--bug-1695083 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Blake Rouse (community) | Approve | ||
|
Review via email:
|
|||
Commit message
When selecting an NTP server address to provide via DHCP, prefer subnets on VLANs where DHCP is enabled.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good.