Merge lp:~allenap/maas/ntp-vendor-data-split-servers-and-pools into lp:~maas-committers/maas/trunk
Proposed by
Gavin Panella
Status: | Merged |
---|---|
Approved by: | Gavin Panella |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5443 |
Proposed branch: | lp:~allenap/maas/ntp-vendor-data-split-servers-and-pools |
Merge into: | lp:~maas-committers/maas/trunk |
Prerequisite: | lp:~allenap/maas/ntp-rack-external-too |
Diff against target: |
197 lines (+72/-29) 4 files modified
src/metadataserver/tests/test_vendor_data.py (+12/-7) src/metadataserver/vendor_data.py (+11/-3) src/provisioningserver/ntp/config.py (+20/-19) src/provisioningserver/ntp/tests/test_config.py (+29/-0) |
To merge this branch: | bzr merge lp:~allenap/maas/ntp-vendor-data-split-servers-and-pools |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+307564@code.launchpad.net |
Commit message
Publish both NTP servers and pools in vendor-data.
To post a comment you must log in.
Looks good.