]> git.ipfire.org Git - thirdparty/snort3.git/commit
projects / thirdparty / snort3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b58fcf3) | patch
Merge pull request #1460 in SNORT/snort3 from ~MDAGON/snort3:file_reload to master
authorTom Peters (thopeter) <thopeter@cisco.com>
Wed, 12 Dec 2018 20:38:42 +0000 (15:38 -0500)
committerTom Peters (thopeter) <thopeter@cisco.com>
Wed, 12 Dec 2018 20:38:42 +0000 (15:38 -0500)
commitbea170355e8a03d51bac6dab4e68584fa264c495
tree25aa074bbe0584aefe082db964268a357d85e5d7tree
parentb58fcf336c36d99a877f3b6e28a8df2bfd1ebcb0commit | diff
Merge pull request #1460 in SNORT/snort3 from ~MDAGON/snort3:file_reload to master

Squashed commit of the following:

commit 9af61b0b8f0f41516123d018d94cb21f710f2944
Author: mdagon <mdagon@cisco.com>
Date:   Wed Oct 31 15:38:00 2018 -0400

    file_api: fail the reload if max_files_cache is changed  or if capture was initially enabled and capture_memcap or capture_block_size change
src/file_api/file_service.cc diff | blob | blame | history
src/file_api/file_service.h diff | blob | blame | history
src/main/snort.cc diff | blob | blame | history
Mirror of https://github.com/snort3/snort3.git