]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #566 in SNORT/snort3 from 203 to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 22 Jul 2016 15:25:30 +0000 (11:25 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 22 Jul 2016 15:25:30 +0000 (11:25 -0400)
commitbc4ea3f9736f4764444ff694af5380056a961cb3
tree9437c07eb3096cd65d86c908350d99dd0979da0a
parent48b39259692479a6557a9777b3c5ff96780d30fe
Merge pull request #566 in SNORT/snort3 from 203 to master

Squashed commit of the following:

commit f2bbfd30862eda17647f842d31b4d4e595fbd9da
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Jul 22 10:08:22 2016 -0400

    bump to build 203, update change log
    warn on duplicate ports in list
    allow multiple ip_proto and stream_size per rule
ChangeLog
src/ips_options/ips_ip_proto.cc
src/main/build.h
src/ports/port_object.cc
src/stream/tcp/ips_stream_size.cc