]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #3055 in SNORT/snort3 from ~BSACHDEV/snort3:old_commit to master
authorBhargava Jandhyala (bjandhya) <bjandhya@cisco.com>
Mon, 13 Sep 2021 05:44:54 +0000 (05:44 +0000)
committerBhargava Jandhyala (bjandhya) <bjandhya@cisco.com>
Mon, 13 Sep 2021 05:44:54 +0000 (05:44 +0000)
commitbad9c7eaff87d6d96c0e35ff8565827319eeb2a6
tree1a0d88b8bdd5c73e095adfe066a041ee52498d42
parent4b852d3d1fd4b1137e2e1646859a2add8c0f6761
Merge pull request #3055 in SNORT/snort3 from ~BSACHDEV/snort3:old_commit to master

Squashed commit of the following:

commit e739ce037ad55f14198c92d5d2537bca5b3cdcfa
Author: bsachdev <bsachdev@cisco.com>
Date:   Thu Sep 9 11:14:37 2021 -0400

    Revert "Merge pull request #2916 in SNORT/snort3 from ~DIPANDIT/snort3:flow_from_file_context to master"

    This reverts commit 1c499b3816b3f1435d2b56f5ee0912bd0586cc68.
src/file_api/file_cache.cc
src/file_api/file_flows.cc
src/file_api/file_lib.cc
src/file_api/file_lib.h