1.2.0rc2

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bde32621f119bacb58c77b5a41cbb3710a7c4cf..bfeacb5b6f68a256dceb67bafaed09c6565a1731 100644 (file)
--- 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 24f35d130f39e56e6f222c900b6200557ad3c614..9ed81d644c7d0431e872b632c420dc5ee64e8c8c 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.0dev1"
+version = "1.2.0rc2"