]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #597 in SNORT/snort3 from double_vlan to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 17 Aug 2016 18:38:41 +0000 (14:38 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 17 Aug 2016 18:38:41 +0000 (14:38 -0400)
commit973a974bc2bf265b6c1a8b52dabddd09eaaccb82
tree151ffda27c0823facaa36012b305e6b251ef84a7
parenta17e0d193b0b2ab0a6bd384c79201cdd01491d39
Merge pull request #597 in SNORT/snort3 from double_vlan to master

Squashed commit of the following:

commit 9801a96ba004a74c0424d7eece759f9a4c217d62
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Wed Aug 17 13:29:44 2016 -0400

    Porting the Double and triple vlan tagging changes
src/codecs/link/cd_vlan.cc
src/protocols/protocol_ids.h