Merge remote-tracking branches 'origin/topic/dnthayer/ticket1963' and 'origin/topic/jsiwek/improve-input-reread'

* origin/topic/dnthayer/ticket1963:
  Convert more redef-able constants to runtime options

* origin/topic/jsiwek/improve-input-reread:
  Improve input framework re-read logic
This commit is contained in:
Johanna Amann 2018-08-28 14:22:25 -07:00
commit 4fd6cbd138
26 changed files with 111 additions and 41 deletions

View file

@ -1,4 +1,13 @@
2.5-915 | 2018-08-28 14:22:25 -0700
* Improve input framework re-read logic
Changed from checking for "has newer modification time" to "has
different modification time or inode number". (Jon Siwek, Corelight)
* Convert more redef-able constants to runtime options (Daniel Thayer)
2.5-911 | 2018-08-24 17:47:03 -0700
* Add a missing initializer to a runtime option (Daniel Thayer)