[Bro-Dev] Merging updates

2014-05-08 Thread Robin Sommer
Two updates regarding merges: - Jon Siwek is joining the ranks of the Bro Merge Masters(TM). So it's now Jon, Seth, and myself doing merges of topic branches into master across the bro.org repositories. - I've updated our Development Process page with some notes on how

[Bro-Dev] [JIRA] (BIT-348) Reassembler integer overflow issues. Data not delivered after 2GB

2014-05-08 Thread Robin Sommer (JIRA)
[ https://bro-tracker.atlassian.net/browse/BIT-348?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=16400#comment-16400 ] Robin Sommer commented on BIT-348: -- thanks for tracking this done, sounds reasonable. I looked