From 50e857f75e576e239d8306a6ac55946a1ce252a6 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Mon, 22 Feb 2021 22:54:11 -0600 Subject: [PATCH] version: 1.2.1 --- CHANGELOG.md | 2 +- suricata/update/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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" -- 2.47.3