[Bro-Dev] [Auto] Merge Status

[Merge Tracker]

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

ID            Component    Reporter       Assignee       Updated     For Version    Priority    Summary
------------  -----------  -------------  -------------  ----------  -------------  ----------  --------------------------------------------------------------------
BIT-1376 [1]  Bro          Jon Siwek      Robin Sommer   2015-04-16  -              Normal      method to reproduce "internal error: unknown msg type 115 in Poll()"
BIT-1374 [2]  BroControl   Daniel Thayer  Justin Azoff   2015-04-13  2.4            Normal      topic/dnthayer/more-fixes-for-2.4 [3]
BIT-1353 [4]  BroControl   Johanna Amann  Daniel Thayer  2015-04-16  2.4            Normal      BroCtl status/top take excessive amount of time
BIT-1333 [5]  Bro          Paul Pearce    Seth Hall      2015-04-16  2.4            Normal      Bro's ASCII logging facilities do not escape escape characters


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

Issue    Component    User         Updated     Title
-------  -----------  -----------  ----------  ----------------------------------------------
#29 [6]  bro          jshlbrd [7]  2015-03-25  Add PROXY-AUTHORIZATION header to http.log [8]


[1]  BIT-1376                     https://bro-tracker.atlassian.net/browse/BIT-1376
[2]  BIT-1374                     https://bro-tracker.atlassian.net/browse/BIT-1374
[3]  more-fixes-for-2.4           https://github.com/bro/brocontrol/tree/topic/dnthayer/more-fixes-for-2.4
[4]  BIT-1353                     https://bro-tracker.atlassian.net/browse/BIT-1353
[5]  BIT-1333                     https://bro-tracker.atlassian.net/browse/BIT-1333
[6]  Pull Request #29             https://github.com/bro/bro/pull/29
[7]  jshlbrd                      https://github.com/jshlbrd
[8]  Merge Pull Request #29 with  git pull --no-ff --no-commit https://github.com/jshlbrd/bro.git patch-2