4 commits

Author	SHA1	Message	Date
Robin Sommer	fb848f795d	Merge branch 'master' of https://github.com/aaronmbr/bro ... * 'master' of https://github.com/aaronmbr/bro: Copy-paste issue Allow for logging of the VLAN data about a connection in conn.log Save the inner vlan in the Packet object for Q-in-Q setups	2015-07-23 13:05:28 -07:00
Aaron Brown	d76c7a2657	Save the inner vlan in the Packet object for Q-in-Q setups	2015-07-22 12:52:10 -04:00
Robin Sommer	f97b2b180c	Moving the remaining code from Layer2.* into Packet.* and documenting ... the Packet API. Plus, some more cleanup, including removing a legacy option time_machine_profiling.	2015-07-21 08:30:23 -07:00
Robin Sommer	f69edd1437	Adding missing files.	2015-07-20 16:49:03 -07:00