REL: Bugfix release 2.1.1

certtools · Nov 11, 2019 · db82a82 · db82a82
1 parent dd2d4c4
commit db82a82
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@ CHANGELOG
 ==========
 
 
-2.1.1 (unreleased)
+2.1.1 (2019-11-11)
 ------------------
 
 ### Configuration
@@ -17,20 +17,14 @@ CHANGELOG
   - `TimeoutHTTPAdapter`: A subclass of `requests.adapters.HTTPAdapter` with the possibility to set the timeout per adapter.
   - `create_request_session_from_bot`: Use the `TimeoutHTTPAdapter` with the user-defined timeout. Previously the timeout was not functional.
 
-### Development
-
-### Harmonization
-
 ### Bots
-#### Collectors
-
 #### Parsers
 - `intelmq.bots.parsers.shadowserver.parser`: Fix logging message if the parameter `feedname` is not present.
 - `intelmq.bots.parsers.shodan.parser`: Also add field `classification.identifier` (`'network-scan'`) in minimal mode.
 - `intelmq.bots.parsers.spamhaus.parser_cert`: Add support for category `'misc'`.
 - `intelmq.bots.parsers.cymru.parser_cap_program`:
   - Add support for phishing events without URL.
-  - Add support for protocols >= 143 (unassigned, experients, testing, reserved), saving the number to extra, as the data would be bogous.
+  - Add support for protocols >= 143 (unassigned, experiments, testing, reserved), saving the number to extra, as the data would be bogus.
 - `intelmq.bots.parsers.microsoft.parser_bingmurls`:
   - Save the `Tags` data as `source.geolocation.cc`.
 
@@ -49,19 +43,24 @@ CHANGELOG
 - Bots:
   - Sieve expert: Document behavior of `!=` with lists.
 
-### Packaging
-
 ### Tests
+- Adaption and extension of the test cases to the changes.
 
 ### Tools
 - `intelmq.bin.intelmqctl`:
   - check: Check if running the upgrade function for harmonization is necessary.
   - upgrade-config: Run the upgrade function for harmonization.
   - `intelmqctl restart` did throw an error as the message for restarting was not defined (#1465).
 
-### Contrib
-
 ### Known issues
+- MongoDB authentication: compatibility on different MongoDB and pymongo versions (#1439)
+- ctl: shell colorizations are logged (#1436)
+- http stream collector: retry on regular connection problems? (#1435)
+- tests: capture logging with context manager (#1342)
+- Bots started with IntelMQ-Manager stop when the webserver is restarted. (#952)
+- n6 parser: mapping is modified within each run (#905)
+- reverse DNS: Only first record is used (#877)
+- Corrupt dump files when interrupted during writing (#870)
 
 
 2.1.0 (2019-10-15)

diff --git a/NEWS.md b/NEWS.md
@@ -3,11 +3,9 @@ NEWS
 
 See the changelog for a full list of changes.
 
-2.1.1 Bugfix release (unreleased)
+2.1.1 Bugfix release (2019-11-11)
 ---------------------------------
 
-### Requirements
-
 ### Tools
 `intelmqctl check` and `intelmqctl upgrade-config` checks/applies a generic harmonization upgrade, checking for it's completeness.
 
@@ -24,10 +22,6 @@ In version 2.1.0 a new field `extra` has been added to *Reports*. You need to ad
 #### Defaults
 For AMQP brokers, the port 15671 was used as default for connecting to the management interface. But RabbitMQ's default is 15672. This was corrected in this version. If you changed the port in RabbitMQ or IntelMQ (`intelmqctl_rabbitmq_monitoring_url`), the settings needs to be adapted.
 
-### Libraries
-
-### Postgres databases
-
 
 2.1.0 Feature release (2019-10-15)
 ----------------------------------

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+intelmq (2.1.1-1) stable; urgency=medium
+
+  * Update to 2.1.1.
+
+ -- Wagner Sebastian <[email protected]>  Mon, 11 Nov 2019 16:29:55 +0100
+
 intelmq (2.1.0-1) stable; urgency=medium
 
   * Update to 2.1.0

diff --git a/intelmq/version.py b/intelmq/version.py
@@ -1,2 +1,2 @@
-__version_info__ = (2, 1, 1, 'alpha', 1)
+__version_info__ = (2, 1, 1)
 __version__ = '.'.join(map(str, __version_info__))