From: Jason Ish <jason.ish@oisf.net>
Date: Mon, 5 Oct 2020 15:00:01 +0000 (-0600)
Subject: 1.2.0: update version and changelog
X-Git-Tag: 1.2.0^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86e530cbbfc78ac327072750a12edf888e6b8cae;p=thirdparty%2Fsuricata-update.git

1.2.0: update version and changelog
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfeacb5..7fc6b28 100644
--- 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 9ed81d6..01c4c83 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.2.0rc2"
+version = "1.2.0"