From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 17 Feb 2021 15:35:32 +0000 (-0600)
Subject: changelog: update
X-Git-Tag: 1.2.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=019400c50e85770377532bc46bbecf64eaa42a80;p=thirdparty%2Fsuricata-update.git

changelog: update
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fc6b28..b0b8dcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## unreleased
+- Fix --no-merge. Redmine issue
+  https://redmine.openinfosecfoundation.org/issues/4324.
+
 ## 1.2.0 - 2020-10-05
 - Documentation updates.