115

diff --git a/ChangeLog b/ChangeLog
index 3ed8bf60cb66de2b334b0529f31628cf2aac333f..b373b3ba51a63f82e99dd89a256845654fcc924a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 -- misc FIXITs
 -- refactored cmd line parsing and moved options to SnortModule
 -- prioritized all FIXITs; FIXIT-J are for josh to reprioritize
+-- got latest from Josh
 
 114
 -- more FIXIT cleanup

diff --git a/configure.ac b/configure.ac
index 800bdb067c03593712213ef1c4ecc3b5c9e00920..8aff6e50ef4a3c27be6ee7ed413e77befc2634a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@
 # initialization
 #--------------------------------------------------------------------------
 
-AC_INIT([snort], [2.10.114])
+AC_INIT([snort], [2.10.115])
 AC_PREREQ([2.68])
 
 AC_CONFIG_SRCDIR([src/main.h])