From e33a3a9c0298dec00474c1e4b79dce2b57dafaa5 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Tue, 26 Jun 2018 18:06:07 -0500 Subject: [PATCH] Fix typo in NEWS --- CHANGES | 16 ++++++++++++++++ NEWS | 2 +- VERSION | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 78c8dbf629..f8ca072f83 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,20 @@ +2.5-710 | 2018-06-26 18:06:22 -0500 + + * Add memory leak unit test for pattern operations (Corelight) + + * fixed 3 leaks in creating pattern values (Vern Paxson) + + * add & and | operators for patterns (Vern Paxson) + + * deprecate merge_patterns() (Vern Paxson) + + * deprecate boolean scalar+vector operations (Vern Paxson) + + * deprecate mixing scalars and vectors (Vern Paxson) + + * deprecate && / || operators for patterns (Vern Paxson) + 2.5-690 | 2018-06-26 15:05:23 -0500 * Fix deprecated actor_system_config field usages (Corelight) diff --git a/NEWS b/NEWS index f594207f58..a4f233a116 100644 --- a/NEWS +++ b/NEWS @@ -252,7 +252,7 @@ New Functionality - The '&' and '|' operators can apply to patterns, too. p1 & p2 yields a pattern that represents matching p1 followed by p2, and p1 | p2 yields a pattern representing matching p1 or p2. The p1 | p2 functionality was - semi-present in previous versions of Bro, but required constants as as + semi-present in previous versions of Bro, but required constants as its operands; now you can use any pattern-valued expressions. Changed Functionality diff --git a/VERSION b/VERSION index c546c8150b..ca1bc4e12b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-690 +2.5-710