Pull request #3522: build: generate and tag 3.1.37.0

Merge in SNORT/snort3 from ~RUCOMBS/snort3:build_3.1.37.0 to master

Squashed commit of the following:

commit 8c50976531c3012679e8c982d32e1b8f1689ad80
Author: russ <rucombs@cisco.com>
Date:   Mon Jul 18 16:27:54 2022 -0400

    build: generate and tag 3.1.37.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72b5b18a15a2ffa792d1337a815808d8c0a26af2..b1efafe8e35b681fd5b28b4d924f54c54559baea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project (snort CXX C)
 
 set (VERSION_MAJOR 3)
 set (VERSION_MINOR 1)
-set (VERSION_PATCH 36)
+set (VERSION_PATCH 37)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog b/ChangeLog
index 5dbfe11a94087b4f541d7a56f9b84170e876d78e..b2a2009c7ac70388392949819f642d20e6d05343 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022/07/19 - 3.1.37.0
+
+reputation: print LogMessage in reputation only when in verbose mode
+utils: fix Unicode LS PS handling in JavaScript
+
+
 2022/07/14 - 3.1.36.0
 
 appid: fix stats cleanup

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index 3182b7f3338dcb393b428a6d8599cc7159ce3930..29d8e2ddea5193d6f248004f0a5f243621372072 100644 (file)
--- a/doc/reference/snort_reference.text
+++ b/doc/reference/snort_reference.text
@@ -8,7 +8,7 @@ Snort 3 Reference Manual
 The Snort Team
 
 Revision History
-Revision 3.1.36.0 2022-07-14 13:46:25 EDT TST
+Revision 3.1.37.0 2022-07-18 16:24:41 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index 0c6146db945bc4cdfdbcfe0ddf44ba819f04e390..11ff8eb214f296b0e0a18d40da874594ab4291a1 100644 (file)
--- a/doc/upgrade/snort_upgrade.text
+++ b/doc/upgrade/snort_upgrade.text
@@ -8,7 +8,7 @@ Snort 3 Upgrade Manual
 The Snort Team
 
 Revision History
-Revision 3.1.36.0 2022-07-14 13:46:11 EDT TST
+Revision 3.1.37.0 2022-07-18 16:25:29 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 78b03d7561ba43657e7869bcf1d3375c7930ad23..50fdce0bae2179d737275ae6b066faa79b68562e 100644 (file)
--- a/doc/user/snort_user.text
+++ b/doc/user/snort_user.text
@@ -8,7 +8,7 @@ Snort 3 User Manual
 The Snort Team
 
 Revision History
-Revision 3.1.36.0 2022-07-14 13:46:11 EDT TST
+Revision 3.1.37.0 2022-07-18 16:24:26 EDT TST
 
 ---------------------------------------------------------------------