From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 9 Sep 2020 22:22:57 +0000 (-0600)
Subject: 1.2.0rc2
X-Git-Tag: 1.2.0rc2^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18b0b17c0f01ab59510de45e98cc9e6d1600a5f8;p=thirdparty%2Fsuricata-update.git

1.2.0rc2
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bde326..bfeacb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Change Log
 
-## unreleased
+## 1.2.0rc2 - 2020-09-09
+
+### Features
+- Obsolete and deprecated source handling from the index:
+  https://redmine.openinfosecfoundation.org/issues/3918,
+  https://redmine.openinfosecfoundation.org/issues/3919.
+
+### Fixes
+- Fix re-enabling a disabled source that was initially added with
+  "add-source": https://redmine.openinfosecfoundation.org/issues/3843
+- Handle duplicate filenames across multiple sources:
+  https://redmine.openinfosecfoundation.org/issues/3174
 
 ## 1.2.0rc1 - 2020-08-05
 
diff --git a/suricata/update/version.py b/suricata/update/version.py
index 24f35d1..9ed81d6 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.0dev1"
+version = "1.2.0rc2"