[Bro-Dev] [Auto] Merge Status

[Merge Tracker]

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

ID            Component    Reporter         Assignee    Updated     For Version    Priority    Summary
------------  -----------  ---------------  ----------  ----------  -------------  ----------  ------------------------------------------------
BIT-1457 [1]  Bro          Mike Freemon     -           2015-08-19  -              Normal      [PATCH] add support for MIME type video/MP2T
BIT-1455 [2]  BTest        Daniel Thayer    -           2015-08-16  2.5            Normal      topic/dnthayer/py3-compat [3]
BIT-1454 [4]  Broker       Mathias Fischer  -           2015-08-17  -              Normal      Merge request for topic/mfischer/broker-bugfixes


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

Commit       Component      Author         Date        Summary
-----------  -------------  -------------  ----------  ----------------------------------------------------------
f3fb2b2 [5]  bro            Daniel Thayer  2015-08-15  Fix diff-canonifier-external to use basename of input file
32a793f [6]  bro-plugins    Daniel Thayer  2015-08-18  Fix minor typo in README
6fb3dfe [7]  bro-plugins    Daniel Thayer  2015-08-18  Fix doc build warnings for Redis and PF_RING
8531d13 [8]  trace-summary  Daniel Thayer  2015-08-14  Fix typo in a TEST_DIFF_CANONIFIER script name


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

Issue     Component    User             Updated     Title
--------  -----------  ---------------  ----------  ---------------------------------------------------
#43 [9]   bro          balintm [10]     2015-08-19  Update to SIP protocol [11]
#42 [12]  bro          J-Gras [13]      2015-08-19  Improved logging of Base64 errors [14]
#40 [15]  bro          knielander [16]  2015-08-18  Enable linux fanout mode with Bro [17]
#6 [18]   bro-plugins  jswaro [19]      2015-08-19  Adding initial conversion of TCPRS to a plugin [20]


[1]   BIT-1457                     https://bro-tracker.atlassian.net/browse/BIT-1457
[2]   BIT-1455                     https://bro-tracker.atlassian.net/browse/BIT-1455
[3]   py3-compat                   https://github.com/bro/btest/tree/topic/dnthayer/py3-compat
[4]   BIT-1454                     https://bro-tracker.atlassian.net/browse/BIT-1454
[5]   f3fb2b2                      https://github.com/bro/bro/commit/f3fb2b2f527de34b2b888122f6a24af126e4edd4
[6]   32a793f                      https://github.com/bro/bro-plugins/commit/32a793ff1828a3b43fab479f5eefbe6fd0e0a649
[7]   6fb3dfe                      https://github.com/bro/bro-plugins/commit/6fb3dfeb248cd790f20e843e3eb2f4d7545d68ff
[8]   8531d13                      https://github.com/bro/trace-summary/commit/8531d13809df4c5251a1a08f960512e3aecd4e17
[9]   Pull Request #43             https://github.com/bro/bro/pull/43
[10]  balintm                      https://github.com/balintm
[11]  Merge Pull Request #43 with  git pull --no-ff --no-commit https://github.com/balintm/bro.git patch-1
[12]  Pull Request #42             https://github.com/bro/bro/pull/42
[13]  J-Gras                       https://github.com/J-Gras
[14]  Merge Pull Request #42 with  git pull --no-ff --no-commit https://github.com/J-Gras/bro.git topic/jgras/base64-logging
[15]  Pull Request #40             https://github.com/bro/bro/pull/40
[16]  knielander                   https://github.com/knielander
[17]  Merge Pull Request #40 with  git pull --no-ff --no-commit https://github.com/knielander/bro.git master
[18]  Pull Request #6              https://github.com/bro/bro-plugins/pull/6
[19]  jswaro                       https://github.com/jswaro
[20]  Merge Pull Request #6 with   git pull --no-ff --no-commit https://github.com/jswaro/bro-plugins.git topic/jswaro/feature/initial-tcprs-plugin