]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #707 in SNORT/snort3 from misc_fixes to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 16 Nov 2016 22:29:27 +0000 (17:29 -0500)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 16 Nov 2016 22:29:27 +0000 (17:29 -0500)
commit1068f2927eda2400f82c8b838717372f5fd2edfe
tree2bcd57d2ccba0cac7d1a6fd9056f670bd62bdaa7
parent9593662e1d9f5c08bdbbe4d04b701f468832397e
Merge pull request #707 in SNORT/snort3 from misc_fixes to master

Squashed commit of the following:

commit d796882a69f686aeb582f70a1ff6b94a44bf05ad
Author: Russ Combs <rucombs@cisco.com>
Date:   Wed Nov 16 09:38:56 2016 -0500

    revert to dumping 16 bytes per line by default

commit ae16bba4a86d6cdab6af1c38556cb3718fa1ee24
Author: Russ Combs <rucombs@cisco.com>
Date:   Wed Nov 16 09:03:20 2016 -0500

    fix out-of-tree doc builds
    fix image sizes to fit page; thanks to wyatuestc for reporting the issue
    change -L to -K in README and manual; thanks to jncornett for reporting the issue

commit fc11b8819ee95214023d973e0bd376ef0f630dba
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Nov 15 07:34:09 2016 -0500

    fix fast pattern selection when multiple designated
    thanks to j.mcdowell@titanicsystems.com for reporting the issue
17 files changed:
README.md
doc/CMakeLists.txt
doc/Makefile.am
doc/building.txt [new file with mode: 0644]
doc/differences.txt
doc/features.txt
doc/file_processing.txt [moved from doc/manual/file_processing.txt with 97% similarity]
doc/overview.txt
doc/perf_monitor.txt [moved from doc/manual/perf_monitor.txt with 97% similarity]
doc/reference.txt
doc/snort_manual.html
doc/snort_manual.pdf
doc/snort_manual.text
doc/snort_manual.txt
doc/start.txt
src/detection/fp_utils.cc
src/log/log_text.cc