~mpontillo/maas:add-dhcp-search-list--bug-1696485

Branch merges

Propose for merging

Merged into maas:master

Blake Rouse (community): Approve on 2017-10-23

Diff: 531 lines (+161/-18)

12 files modified

contrib/pycharm/maas.iml (+1/-0)
src/maasserver/dhcp.py (+21/-7)
src/maasserver/preseed_network.py (+3/-1)
src/maasserver/tests/test_dhcp.py (+30/-6)
src/provisioningserver/dhcp/config.py (+11/-0)
src/provisioningserver/dhcp/testing/config.py (+3/-1)
src/provisioningserver/dhcp/tests/test_config.py (+28/-0)
src/provisioningserver/rpc/cluster.py (+2/-0)
src/provisioningserver/templates/dhcp/dhcpd.conf.template (+4/-1)
src/provisioningserver/templates/dhcp/dhcpd6.conf.template (+4/-0)
src/provisioningserver/utils/tests/test_text.py (+43/-0)
src/provisioningserver/utils/text.py (+11/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

0a262af... by Mike Pontillo on 2017-10-17

LP: #1696485 - Add search list to DHCP options.

d354491... by Andres Rodriguez on 2017-10-13

LP: #1722848 - Fix memtester test to at least reserve 64M of memory.

Increasing the reserved memory to at least 64M for 8GB systems, or 0.77% of memory for larger systems, ensures that the machine doesn't lock up, which causes the tests to timeout. Drive-by fix on the UI to not show unnecessary word on storage card.

e2fe137... by Newell Jensen on 2017-10-12

LP: #1721268 -- Fix padding for metrics tables.

29a17e5... by Adam Collard on 2017-10-12

Fix snapcraft.yaml spelling

682702b... by Andres Rodriguez on 2017-10-11

Update debian/changelog

7571f67... by Andres Rodriguez on 2017-10-11

Update debian/changelog

dd05aa2... by Blake Rouse on 2017-10-11

Improved analytics tracking with userId and dimensions for MAAS version and UUID.

cf51d62... by Mike Pontillo on 2017-10-10

LP: #1722589 - Place beacon logging under debug flag

 * Drive-by fix to add *.*.swp files to .gitignore
 * Drive-by fix to use solicitation packets for periodic beacons
 * Make boolean usage in services.py consistent
   (no need to test if a bool is True)

ababee0... by Lee Trager on 2017-10-10

LP: #1710092 - Use a monotonic clock instead of relative time.

Previously MAAS was using datetime.now() to calculate timeout. datetime.now()
may change use to NTP running or under high system load. time.monotonic()
gives a consistent incrementing time rate.

8510718... by Lee Trager on 2017-10-10

LP: #1721587 - Create a script-result-list directive.

The script-result-list directive allows both the testing and commissioning
tab to use the same code for displaying results. This gives both pages the
same feature sets.

As the UI is now using the node-result web socket to retrieve commissioning
and testing results they are no longer sent on the node object. The node
results controller has been updated to only request from the region the
results currently being viewed(commissioning or testing). These changes mean
the region only sends the result data currently being viewed.