]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Merge pull request #417 in SNORT/snort3 from ~MIALTIZE/snort3:sfdaq to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 13 Apr 2016 21:40:54 +0000 (17:40 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 13 Apr 2016 21:40:54 +0000 (17:40 -0400)
* commit '4c0d2abc95992d478e19f9aa3b39841e85894123':
  sfdaq: Let the Style Wookiee win.
  snort2lua: Handle DAQ/SFDAQ config changes
  util: Remove unused StringVector code
  sfdaq: Replace Snort DAQ module with the SFDAQ module
  thread_config: Only log when actually changing thread affinity
  dce_rpc: Make DCE2_HandleSegmentation static
  m4: Update macros with upstream from autoconf-archive

1  2 
src/main/modules.cc
src/utils/stats.cc
src/utils/stats.h

Simple merge
Simple merge
Simple merge