[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
-------  -----------  --------------------  ----------  ------------------------------------------------------------------------
#48 [4]  bro          aeppert [5]           2015-12-04  Update windows-version-detection.bro [6]
#46 [7]  bro          albertzaharovits [8]  2015-11-03  HTTP Content-Disposition header updates filename field in HTTP::Info [9]
#1 [10]  broctl       J-Gras [11]           2015-10-24  Added support for Pcap options [12]


[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 #48             https://github.com/bro/bro/pull/48
[5]   aeppert                      https://github.com/aeppert
[6]   Merge Pull Request #48 with  git pull --no-ff --no-commit https://github.com/aeppert/bro.git patch-1
[7]   Pull Request #46             https://github.com/bro/bro/pull/46
[8]   albertzaharovits             https://github.com/albertzaharovits
[9]   Merge Pull Request #46 with  git pull --no-ff --no-commit https://github.com/albertzaharovits/bro.git master
[10]  Pull Request #1              https://github.com/bro/broctl/pull/1
[11]  J-Gras                       https://github.com/J-Gras
[12]  Merge Pull Request #1 with   git pull --no-ff --no-commit https://github.com/J-Gras/broctl.git topic/jgras/pcap-config