1.2.0: update version and changelog

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfeacb5b6f68a256dceb67bafaed09c6565a1731..7fc6b28538125c2f104e687cbd3f3b98746d40fe 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## 1.2.0 - 2020-10-05
+- Documentation updates.
+
 ## 1.2.0rc2 - 2020-09-09
 
 ### Features

diff --git a/suricata/update/version.py b/suricata/update/version.py
index 9ed81d644c7d0431e872b632c420dc5ee64e8c8c..01c4c83a6bb6d96a8d4708966ca5274a63d4b627 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.2.0rc2"
+version = "1.2.0"