REL: 2.2.0 Release Candidate 1

CHANGELOG.md

@@ -93,6 +93,7 @@ Dropped support for Python 3.4.
 - Added tests for `intelmq.lib.bot.OutputBot` and `intelmq.lib.bot.OutputBot.export_event`.
 - Added IPv6 tests for `intelmq.bots.parsers.cymru.parser_full_bogons`.
 - Added tests for `intelmq.lib.bot.ParserBot`'s new methods `parse_json_stream` and `recover_line_json_stream`.
+- `intelmq.tests.test_conf`: Set encoding to UTF-8 for reading the `feeds.yaml` file.
 
 ### Tools
 - `intelmqctl`:
@@ -119,40 +120,6 @@ Dropped support for Python 3.4.
 ### Known issues
 
 
-2.1.4 (unreleased)
-------------------
-
-### Configuration
-
-### Core
-
-### Development
-
-### Harmonization
-
-### Bots
-#### Collectors
-
-#### Parsers
-
-#### Experts
-
-#### Outputs
-
-### Documentation
-
-### Packaging
-
-### Tests
-- `intelmq.tests.test_conf`: Set encoding to UTF-8 for reading the `feeds.yaml` file.
-
-### Tools
-
-### Contrib
-
-### Known issues
-
-
 2.1.3 (2020-05-26)
 ------------------
 

debian/changelog

@@ -1,3 +1,9 @@
+intelmq (2.2.0~rc1-1) unstable; urgency=medium
+
+  * Update to 2.2.0 Release Candidate 1.
+
+ -- Sebastian Wagner <wagner@cert.at>  Sat, 30 May 2020 12:22:30 +0200
+
 intelmq (2.2.0~alpha2-1) unstable; urgency=medium
 
   * Update to 2.2.0~alpha1.

intelmq/version.py

@@ -1,2 +1,2 @@
-__version_info__ = (2, 2, 0, 'alpha', 2)
+__version_info__ = (2, 2, 0, 'rc', 1)
 __version__ = '.'.join(map(str, __version_info__))