]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #2596 in SNORT/snort3 from ~VKAMBALA/snort3:vkambala to master
authorLokesh Bevinamarad (lbevinam) <lbevinam@cisco.com>
Tue, 17 Nov 2020 14:47:42 +0000 (14:47 +0000)
committerLokesh Bevinamarad (lbevinam) <lbevinam@cisco.com>
Tue, 17 Nov 2020 14:47:42 +0000 (14:47 +0000)
commitd3bc8a84ae2ee3b6e8643215dbc8212624ddff8b
tree36dd1957b856e3fad8ac3edf19875d2f34f2b3e6
parent5ba3210fd92b6a0fdb119726a7175061dbea7d7c
Merge pull request #2596 in SNORT/snort3 from ~VKAMBALA/snort3:vkambala to master

Squashed commit of the following:

commit 51d44ef769bddb1616445b20425a069a090cdf01
Author: krishnakanth <vkambala@cisco.com>
Date:   Wed Nov 4 02:19:18 2020 -0500

    file_api: handling resume block when multiple file rules are configured with store option enabled
src/file_api/file_flows.cc