]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1056 in SNORT/snort3 from 240 to master 3.0.0-240 BUILD_240
authorRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 31 Oct 2017 16:21:15 +0000 (12:21 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 31 Oct 2017 16:21:15 +0000 (12:21 -0400)
commitd609c825a0b9fcb7b498dabdb383283601b4f186
tree8b345aa53519502f2fd200d3ec5bc8d20b605c8a
parent1c8d6d53f794694672381d5e1dc5785c470616c2
Merge pull request #1056 in SNORT/snort3 from 240 to master

Squashed commit of the following:

commit 11ebc4e36ac87df3570355077336b949e432e0b5
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Oct 31 08:08:58 2017 -0400

    build: bump build to 240

commit af3cdca7657de35e9c3876d4a93dc70522f9f14a
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Oct 31 09:22:16 2017 -0400

    ChangeLog: update for build 240

commit 938cc37229b52d82b4bb738a53083489f8ce9aad
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Oct 31 08:20:45 2017 -0400

    doc: update default manuals

commit fa3c6c2b3f2cc982b5f88cb279859b1009caea89
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Oct 30 21:26:14 2017 -0400

    cppcheck: add missing copy ctor and assignment oper as default or delete
24 files changed:
ChangeLog
doc/snort_manual.html
doc/snort_manual.pdf
doc/snort_manual.text
src/detection/ips_context.h
src/flow/expect_cache.h
src/flow/flow.h
src/flow/flow_cache.h
src/framework/cursor.h
src/framework/inspector.h
src/hash/zhash.h
src/helpers/ring.h
src/main/build.h
src/main/control.h
src/main/snort_config.h
src/managers/inspector_manager.cc
src/mime/file_mime_process.h
src/network_inspectors/appid/appid_discovery.h
src/network_inspectors/perf_monitor/perf_tracker.h
src/packet_io/sfdaq_config.h
src/protocols/packet.h
src/service_inspectors/wizard/magic.h
src/utils/bitop.h
tools/snort2lua/data/dt_data.h