version: 1.2.1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0b8dcf4f214df6280c4c5a1d13d356a98a69203..eac578e842391161d2c35e5348ae95f5d8c5b7c4 100644 (file)
--- 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 01c4c83a6bb6d96a8d4708966ca5274a63d4b627..97e80e5af96c36b96e4c870394b5f2c009884353 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.0"
+version = "1.2.1"