From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Sat, 4 May 2019 16:23:41 +0000 (-0400)
Subject: Merge pull request #1595 in SNORT/snort3 from ~RUCOMBS/snort3:build_255 to master
X-Git-Tag: 3.0.0-255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdef59525b892814caebb3c77bdb3813ad5702f2;p=thirdparty%2Fsnort3.git

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 65c270af9..eec8027ff 100644
--- 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 347f39a9f..16d3c7e22 100644
--- 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)