From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 18 Mar 2016 17:05:51 +0000 (-0400)
Subject: Merge pull request #352 in SNORT/snort3 from crc/192 to master
X-Git-Tag: 3.0.0-233~524
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee2baba10c770d9cb34e42dffc4388ea66a5d550;p=thirdparty%2Fsnort3.git

Merge pull request #352 in SNORT/snort3 from crc/192 to master

Squashed commit of the following:

commit 2db44acae4668ba667dab0ca29234ef5b59bc472
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Mar 18 13:00:07 2016 -0400

    192
---

diff --git a/ChangeLog b/ChangeLog
index 011581aa6..35fd73aa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+16/03/18 - build 192
+
+-- use hwloc for CPU affinity
+-- fix process stats output
+-- add dce rule options iface, opnum, smb, stub_data, tcp
+-- add dce option for byte_extract/jump/test
+-- initial side channel and file connector for HA
+-- continued memory manager implementation
+-- add UTF-8 normalization for new_http_inspect
+-- fix rule compilation for sticky buffers
+-- host_cache and host_tracker config and stats updates
+-- miscellaneous warning and lint cleanup
+-- snort2Lua updates for preproc sensitive_data and sd_pattern option
+
 16/03/07 - build 191
 
 -- fix perf_monitor stats output at shutdown
diff --git a/src/main/build.h b/src/main/build.h
index b9894b48a..be07d7850 100644
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -10,7 +10,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "191"
+#define BUILD "192"
 
 #endif