]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #698 in SNORT/snort3 from perfmon_docs to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 10 Nov 2016 19:06:48 +0000 (14:06 -0500)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 10 Nov 2016 19:06:48 +0000 (14:06 -0500)
commit45ea1e9fd409bb797024a9a5bf4eefadc237877b
treeb91042bc808301e18a9782c755a001f7f222fedc
parent5db77fbddde58a3053553cbb33852aa469891420
Merge pull request #698 in SNORT/snort3 from perfmon_docs to master

Squashed commit of the following:

commit b8807c17407e8b6b1d65a1ed8d00635eade1f966
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Nov 7 10:09:57 2016 -0500

    added perfmon docs
doc/manual/perf_monitor.txt [new file with mode: 0644]
doc/snort_manual.txt