From 0172557dee57a757cd72db90dbba9ed45578b3a1 Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Tue, 28 Jul 2015 12:13:39 -0700 Subject: [PATCH] Updating submodule(s). [nomail] --- CHANGES | 4 ++++ NEWS | 4 ++++ VERSION | 2 +- aux/plugins | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index a23d6a2fee..f97a6025d5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.4-61 | 2015-07-28 12:13:39 -0700 + + * Renaming config.h to bro-config.h. (Robin Sommer) + 2.4-58 | 2015-07-24 15:06:07 -0700 * Add script protocols/conn/vlan-logging.bro to record VLAN data in diff --git a/NEWS b/NEWS index 3e35d6f492..071677010f 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,10 @@ New Functionality information. Use with care, generating events per packet is expensive. +- New Bro plugins in aux/plugins: + + - pf_ring: Native PF_RING support. + Bro 2.4 ======= diff --git a/VERSION b/VERSION index b85c5a6f78..329e019deb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4-58 +2.4-61 diff --git a/aux/plugins b/aux/plugins index 98ad8a5b97..9abf68366e 160000 --- a/aux/plugins +++ b/aux/plugins @@ -1 +1 @@ -Subproject commit 98ad8a5b97f601a3ec9a773d87582438212b8290 +Subproject commit 9abf68366e91eaf5a30c82930a4e906006d6eea9