[Bro-Dev] [Auto] Merge Status

[Merge Tracker]

Open Merge Requests
===================

ID            Component    Reporter       Assignee      Updated       For Version  Priority    Summary
------------  -----------  -------------  ------------  ----------  -------------  ----------  --------------------------------------------------------------------------------------------------
BIT-1489 [1]  BroControl   Daniel Thayer  Justin Azoff  2015-10-07            2.5  Normal      topic/dnthayer/ticket1396 [2]
BIT-1487 [3]  Bro          Eric Karasuda  Robin Sommer  2015-10-20            2.5  Normal      protocols nested within HTTP CONNECT not properly detected when proxy adds headers to 200 response


Open Fastpath Commits
======================

Commit       Component    Author         Date        Summary
-----------  -----------  -------------  ----------  ----------------------------------------------
5ba8610 [4]  bro          Daniel Thayer  2015-10-21  Correct a typo in controller.bro documentation


Open GitHub Pull Requests
=========================

Issue    Component    User                  Updated     Title
-------  -----------  --------------------  ----------  ------------------------------------------------------------------------
#46 [5]  bro          albertzaharovits [6]  2015-10-17  HTTP Content-Disposition header updates filename field in HTTP::Info [7]
#9 [8]   bro-plugins  J-Gras [9]            2015-10-21  AF_Packet packet source plugin [10]
#8 [11]  bro-plugins  michalpurzynski [12]  2015-10-17  Myricom SNF v3 packet source plugin [13]
#6 [14]  bro-plugins  jswaro [15]           2015-10-16  Adding initial conversion of TCPRS to a plugin [16]
#2 [17]  broctl       J-Gras [18]           2015-10-21  Added plugin for custom load balancing [19]


[1]   BIT-1489                     https://bro-tracker.atlassian.net/browse/BIT-1489
[2]   ticket1396                   https://github.com/bro/brocontrol/tree/topic/dnthayer/ticket1396
[3]   BIT-1487                     https://bro-tracker.atlassian.net/browse/BIT-1487
[4]   5ba8610                      https://github.com/bro/bro/commit/5ba8610681725315f1027ff7e1b5717cd37b501e
[5]   Pull Request #46             https://github.com/bro/bro/pull/46
[6]   albertzaharovits             https://github.com/albertzaharovits
[7]   Merge Pull Request #46 with  git pull --no-ff --no-commit https://github.com/albertzaharovits/bro.git master
[8]   Pull Request #9              https://github.com/bro/bro-plugins/pull/9
[9]   J-Gras                       https://github.com/J-Gras
[10]  Merge Pull Request #9 with   git pull --no-ff --no-commit https://github.com/J-Gras/bro-plugins.git topic/jgras/af-packet
[11]  Pull Request #8              https://github.com/bro/bro-plugins/pull/8
[12]  michalpurzynski              https://github.com/michalpurzynski
[13]  Merge Pull Request #8 with   git pull --no-ff --no-commit https://github.com/michalpurzynski/bro-plugins.git master
[14]  Pull Request #6              https://github.com/bro/bro-plugins/pull/6
[15]  jswaro                       https://github.com/jswaro
[16]  Merge Pull Request #6 with   git pull --no-ff --no-commit https://github.com/jswaro/bro-plugins.git topic/jswaro/feature/initial-tcprs-plugin
[17]  Pull Request #2              https://github.com/bro/broctl/pull/2
[18]  J-Gras                       https://github.com/J-Gras
[19]  Merge Pull Request #2 with   git pull --no-ff --no-commit https://github.com/J-Gras/broctl.git topic/jgras/lb-custom