1.0.0 - update changelog, set version

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e235c00989ef2685276f8e42bef2d98528ea9038..8091831a3725ee81835176440a4ec091521dd1d8 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.0.0 - 2018-11-05
+- Fix failure to run custom test
+  command. https://redmine.openinfosecfoundation.org/issues/2652
+
 ## 1.0.0rc2 - 2018-10-12
 - Python 3 fix for enable-source.
   https://redmine.openinfosecfoundation.org/issues/2549

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