1.1.0: update version and changelog

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f206323b2324dc20aefe8eae2f5de4f96348aecf..6576f32de45f888084ccfd86443506e7fe316136 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## 1.1.0 - 2019-10-11
+- Disable ja3 rules if the Suricata build or runtime configuration
+  does not support
+  ja3. https://redmine.openinfosecfoundation.org/issues/3215
+- New command, check-versions to compare the version of Suricata on
+  the system to Suricata version information in the index. Can let you
+  know if Suricata is
+  outdated. https://redmine.openinfosecfoundation.org/issues/2341
+
 ## 1.1.0rc1 - 2019-09-09
 - Enable integration tests on
   Travis-CI. https://redmine.openinfosecfoundation.org/issues/2760

diff --git a/suricata/update/version.py b/suricata/update/version.py
index e01cc81193266e79c7b954860cc90cccbb2f837c..aaf0bfc19aaceb7b4661397af5e051a9fa419403 100644 (file)
--- a/suricata/update/version.py
+++ b/suricata/update/version.py
@@ -4,4 +4,4 @@
 # Alpha: 1.0.0a1
 # Development: 1.0.0dev0
 # Release candidate: 1.0.0rc1
-version = "1.1.0rc1"
+version = "1.1.0"