diff --git a/CHANGES b/CHANGES index 6833811691..ba02da81ff 100644 --- a/CHANGES +++ b/CHANGES @@ -1,15 +1,4 @@ -2.3-beta-6 | 2014-05-20 10:55:35 -0500 - - * Update intel framework plugin for ssl server_name extension API - changes. (Bernhard Amann, Justin Azoff) - -2.3-beta-3 | 2014-05-20 10:16:50 -0500 - - * Remove remaining references to BROMAGIC (Daniel Thayer) - - * Fix typos and formatting in event and BiF documentation (Daniel Thayer) - 2.3-beta | 2014-05-19 16:36:50 -0500 * Release 2.3-beta @@ -18,6 +7,13 @@ * Fixes for OCSP & x509 analysis memory leak issues. (Bernhard Amann) + * Remove remaining references to BROMAGIC (Daniel Thayer) + + * Fix typos and formatting in event and BiF documentation (Daniel Thayer) + + * Update intel framework plugin for ssl server_name extension API + changes. (Bernhard Amann, Justin Azoff) + 2.2-478 | 2014-05-19 15:31:33 -0500 * Change record ctors to only allow record-field-assignment diff --git a/VERSION b/VERSION index 8e4b4c9121..7ea57c3270 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3-beta-6 +2.3-beta diff --git a/aux/broctl b/aux/broctl index 3204daff74..ca3b124212 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit 3204daff74e1c188934ad34c575477ee91542a38 +Subproject commit ca3b12421269fce655028c05939e0ff2ee82ca2d