[Bro-Dev] [Auto] Merge Status

[Merge Tracker]

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

ID            Component    Reporter         Assignee      Updated       For Version  Priority    Summary
------------  -----------  ---------------  ------------  ----------  -------------  ----------  ---------------------------------------------------------------------------
BIT-1506 [1]  Bro          Vlad Grigorescu  -             2015-12-11            2.5  Normal      Bro fails to build on OS X 10.11 (El Capitan) due to OpenSSL header removal
BIT-1490 [2]  BroControl   Seth Hall        Justin Azoff  2015-12-11            2.5  Low         Need ability to expire logs with more granularity than #days.


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

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


[1]   BIT-1506                     https://bro-tracker.atlassian.net/browse/BIT-1506
[2]   BIT-1490                     https://bro-tracker.atlassian.net/browse/BIT-1490
[3]   Pull Request #48             https://github.com/bro/bro/pull/48
[4]   aeppert                      https://github.com/aeppert
[5]   Merge Pull Request #48 with  git pull --no-ff --no-commit https://github.com/aeppert/bro.git patch-1
[6]   Pull Request #46             https://github.com/bro/bro/pull/46
[7]   albertzaharovits             https://github.com/albertzaharovits
[8]   Merge Pull Request #46 with  git pull --no-ff --no-commit https://github.com/albertzaharovits/bro.git master
[9]   Pull Request #1              https://github.com/bro/broctl/pull/1
[10]  J-Gras                       https://github.com/J-Gras
[11]  Merge Pull Request #1 with   git pull --no-ff --no-commit https://github.com/J-Gras/broctl.git topic/jgras/pcap-config