From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Wed, 13 Apr 2016 21:40:54 +0000 (-0400)
Subject: Merge pull request #417 in SNORT/snort3 from ~MIALTIZE/snort3:sfdaq to master
X-Git-Tag: 3.0.0-233~456
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55a818b440e7c11be55b7af5a480e8fbbe169d2c;p=thirdparty%2Fsnort3.git

Merge pull request #417 in SNORT/snort3 from ~MIALTIZE/snort3:sfdaq to master

* 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
---

55a818b440e7c11be55b7af5a480e8fbbe169d2c