Merge pull request #1595 in SNORT/snort3 from ~RUCOMBS/snort3:build_255 to master

Squashed commit of the following:

commit 5dc88fa07e26e6332fcc681e8d6e7ff0321e712e
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri May 3 18:34:44 2019 -0400

    build: generate and tag build 255

diff --git a/ChangeLog b/ChangeLog
index 65c270af92f20e3f40474b4c51cb37986f3c8aa5..eec8027ffe099e37c278c6ae64623e7937c49645 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+19/05/03 - build 255
+
+-- ips: add includer for better relative path support
+-- module_manager: Fix potential null deref in module parameter dumping
+
 19/04/26 - build 254
 
 -- analyzer: Print pause indicator from analyzer threads

diff --git a/src/main/build.h b/src/main/build.h
index 347f39a9f508060fc899c7bd4dd9a59b8418a49a..16d3c7e22cac9ed2ee3207b2e34405db16ce0f7f 100644 (file)
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -12,7 +12,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD_NUMBER 254
+#define BUILD_NUMBER 255
 
 #ifndef EXTRABUILD
 #define BUILD STRINGIFY_MX(BUILD_NUMBER)