[Bro-Dev] [Auto] Merge Status

[Merge Tracker]

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

ID            Component    Reporter       Assignee      Updated       For Version  Priority    Summary
------------  -----------  -------------  ------------  ----------  -------------  ----------  --------------------------------------------------------------
BIT-1511 [1]  BroControl   Nicolas Merle  Justin Azoff  2015-11-25            2.5  Normal      BroControl unable to recognize ifconfig output in some locales
BIT-1489 [2]  BroControl   Daniel Thayer  Justin Azoff  2015-10-07            2.5  Normal      topic/dnthayer/ticket1396 [3]


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

Issue    Component    User                  Updated     Title
-------  -----------  --------------------  ----------  ------------------------------------------------------------------------
#46 [4]  bro          albertzaharovits [5]  2015-11-03  HTTP Content-Disposition header updates filename field in HTTP::Info [6]
#1 [7]   broctl       J-Gras [8]            2015-10-24  Added support for Pcap options [9]


[1]  BIT-1511                     https://bro-tracker.atlassian.net/browse/BIT-1511
[2]  BIT-1489                     https://bro-tracker.atlassian.net/browse/BIT-1489
[3]  ticket1396                   https://github.com/bro/brocontrol/tree/topic/dnthayer/ticket1396
[4]  Pull Request #46             https://github.com/bro/bro/pull/46
[5]  albertzaharovits             https://github.com/albertzaharovits
[6]  Merge Pull Request #46 with  git pull --no-ff --no-commit https://github.com/albertzaharovits/bro.git master
[7]  Pull Request #1              https://github.com/bro/broctl/pull/1
[8]  J-Gras                       https://github.com/J-Gras
[9]  Merge Pull Request #1 with   git pull --no-ff --no-commit https://github.com/J-Gras/broctl.git topic/jgras/pcap-config