Merge remote-tracking branch 'origin/topic/johanna/local-nets-option'

* origin/topic/johanna/local-nets-option:
  Convert site::local_nets, etc. into options.
This commit is contained in:
Jon Siwek 2018-10-12 12:18:02 -04:00
commit dc7bdc4ca6
4 changed files with 37 additions and 15 deletions

View file

@ -1,4 +1,8 @@
2.6-beta2-27 | 2018-10-12 12:18:02 -0400
* Convert site::local_nets, etc. into options. (Johanna Amann)
2.6-beta2-25 | 2018-10-12 08:33:32 -0400
* Fix crash when modifying a table from within its &expire_func (Jon Siwek, Corelight)