]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #492 in SNORT/snort3 from perf_seg to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 25 May 2016 19:47:45 +0000 (15:47 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 25 May 2016 19:47:45 +0000 (15:47 -0400)
commit05a7ea2c22c748525be41a28619d4e34123ae598
treedaaafdba2a9efddec7d92f5c3351f59ea6570994
parentf423c7bad94250a28e70ccb854eb67fd82df2da6
Merge pull request #492 in SNORT/snort3 from perf_seg to master

Squashed commit of the following:

commit e3b1088fe97bde6220cbaa7cbca9c09c668aedb7
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed May 25 15:23:07 2016 -0400

    fixed perf idle segfault
src/network_inspectors/perf_monitor/perf_monitor.cc