From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 11 Oct 2019 16:01:45 +0000 (-0600)
Subject: 1.1.0: update version and changelog
X-Git-Tag: 1.1.0^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63493dbeac243c285ab25a468fbc02ddedfecfb6;p=thirdparty%2Fsuricata-update.git

1.1.0: update version and changelog
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f206323..6576f32 100644
--- 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 e01cc81..aaf0bfc 100644
--- 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"