Squashed commit of the following:

commit 9a462e8960a5ea1f906339d8261eb280ba0cd24a
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Aug 27 18:09:42 2018 -0400

    build: 247 - beta

diff --git a/ChangeLog b/ChangeLog
index 1119c06f0c990860b79d9622054d632d7168346b..e4989abdf092a2b77e3e33540cfe5755737631a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+18/08/27 - build 247 - Beta
+
+-- appid: change map to unordered map
+-- appid: declare SMTPS early in STARTTLS state on success response code
+-- appid: fix data-race issues from ips_appid_option and improve app_name search
+-- detection: avoid repeating detection by always doing non-fast-pattern rules immediately
+   (applies to experimental offload only)
+-- docs: update default html, pdf, and text user manuals
+-- reputation: reevaluate current flows upon reload
+-- stream_tcp: avoid duplicating split sement data
+-- build: removing use of u_char and u_short macros (github #53)
+
 18/08/13 - build 246
 
 -- active: Add an upper limit of 255 to min_interval
@@ -694,7 +706,7 @@
 -- http_inspect: added alert 119:82 for bad Content-Length value
 -- http_inspect: added alert 119:83 for header wrapping; CR and LF parsed as whitespace
 
-17/03/02 - build 228
+17/03/02 - build 228 - Alpha 4
 
 -- update hypercsan mpse: print error message and erroneous pattern when compilation fails
 -- update rule parser: add multiple byte orders warning

diff --git a/src/main/build.h b/src/main/build.h
index c23a5b212b8de0fb2eb23ae08f55b34d8887b0b0..001ff482d718f0537147253fadb67678d135fb77 100644 (file)
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -12,7 +12,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD_NUMBER 246
+#define BUILD_NUMBER 247
 
 #ifndef EXTRABUILD
 #define BUILD STRINGIFY_MX(BUILD_NUMBER)