From: Jason Ish <jason.ish@oisf.net>
Date: Tue, 23 Feb 2021 04:54:11 +0000 (-0600)
Subject: version: 1.2.1
X-Git-Tag: 1.2.1^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F271%2Fhead;p=thirdparty%2Fsuricata-update.git

version: 1.2.1
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0b8dcf..eac578e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## unreleased
+## 1.2.1 - 2021-02-23
 - Fix --no-merge. Redmine issue
   https://redmine.openinfosecfoundation.org/issues/4324.
 
diff --git a/suricata/update/version.py b/suricata/update/version.py
index 01c4c83..97e80e5 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.0"
+version = "1.2.1"