]> git.ipfire.org Git - thirdparty/snort3.git/commit
projects / thirdparty / snort3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5247ce7) | patch
Merge pull request #1453 in SNORT/snort3 from ~MDAGON/snort3:reload_config to master
authorTom Peters (thopeter) <thopeter@cisco.com>
Tue, 4 Dec 2018 18:56:48 +0000 (13:56 -0500)
committerTom Peters (thopeter) <thopeter@cisco.com>
Tue, 4 Dec 2018 18:56:48 +0000 (13:56 -0500)
commite605b3d26bf528ccc4cb719458e643199c70f905
treecf93a1869ca8e433cda00532b0020291d9dd81d4tree
parent5247ce790e72058fdad340f19791252b2274f7a0commit | diff
Merge pull request #1453 in SNORT/snort3 from ~MDAGON/snort3:reload_config to master

Squashed commit of the following:

commit 13980e232f10ab4f289c4ffde26df4170a865ce5
Author: Maya Dagon <mdagon@cisco.com>
Date:   Fri Nov 16 15:10:19 2018 -0500

    file_api: choose whether to get file config from current config or staged one
src/file_api/file_api.h diff | blob | blame | history
src/file_api/file_config.cc diff | blob | blame | history
src/file_api/file_config.h diff | blob | blame | history
src/ips_options/ips_file_type.cc diff | blob | blame | history
src/managers/inspector_manager.cc diff | blob | blame | history
src/managers/inspector_manager.h diff | blob | blame | history
Mirror of https://github.com/snort3/snort3.git