Skip to content

Commit

Permalink
REL: Maintenance release 2.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Wagner committed Oct 14, 2019
1 parent 43e23f4 commit ff598e9
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 23 deletions.
18 changes: 9 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ CHANGELOG
==========


2.0.2 (unreleased)
2.0.2 (2019-10-14)
-----------------

### Configuration

### Core
- `intelmq.lib.bot.CollectorBot`: Support the deprecated parameter `feed` until version 2.2 as the documentation was not properly updated (#1445).
- `intelmq.lib.bot.Bot`:
Expand All @@ -22,10 +20,6 @@ CHANGELOG
- use default SSL context for client purposes, fixes compatibility with python < 3.6 if TLS is used.
- Reconnect once on sending messages if disconnect detected.

### Development

### Harmonization

### Bots
#### Collectors
- `intelmq.bots.collectors.api.collector_api`:
Expand Down Expand Up @@ -55,8 +49,6 @@ CHANGELOG
#### Outputs
- `intelmq.bots.outputs.amqptopic.output`: use default SSL context for client purposes, fixes compatibility with python < 3.6 if TLS is used.

### Documentation

### Packaging
- Rules:
- Exclude intelmqsetup tool in packages
Expand Down Expand Up @@ -84,6 +76,14 @@ CHANGELOG
- Add `PIDFile` parameter to service file.

### 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.0.1 (2019-08-23)
Expand Down
12 changes: 2 additions & 10 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@ NEWS
See the changelog for a full list of changes.


2.0.2 Bugfix release (unreleased)
2.0.2 Bugfix release (2019-10-14)
---------------------------------

### Requirements

### Tools

### Harmonization
Run `intelmqctl upgrade-config` and `intelmqctl check` after the upgrade.

### Configuration
The deprecated parameter `feed` for collectors is again supported as the documentation as not properly updated. The support will be removed before version 2.2.
Expand All @@ -26,10 +22,6 @@ The Cymru CAP Feed is (being) migrated to a new URL with a different format and
#### Cymru Whois Expert, Modify Expert & Reverse DNS Expert
These bots overwrite existing fields by default. A parameter `overwrite` has been added to make this optional, with the default value of `True` for backwards compatibility. If the parameter is not set, a warning is logged. The default value will change to `False` in version 3.0.0. The default for all new bots (in `BOTS`) is `False` already.

### Libraries

### Postgres databases


2.0.1 Bugfix release (2019-08-23)
---------------------------------
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
intelmq (2.0.2-1) stable; urgency=medium

* Update to 2.0.2.

-- Wagner Sebastian <[email protected]> Mon, 14 Oct 2019 14:47:52 +0200

intelmq (2.0.1-2) stable; urgency=medium

* Backport "intelmqctl: Fix `upgrade-conf` is state file is empty or not existing."
Expand Down
10 changes: 7 additions & 3 deletions docs/Release.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@
- [Announcements](#announcements)
- [Prepare new version](#prepare-new-version)

Make sure the current state is really final ;)
You can test most of the steps described here locally before doing it real.

Assumption: You are working on branch maintenance, the next version is a bug fix release. For feature releaese it is slightly different.
General assumption: You are working on branch maintenance, the next version is a bug fix release. For feature releaese it is slightly different.

## Check before

* Make sure the current state is really final ;)
You can test most of the steps described here locally before doing it real.
* Check the upgrade functions in `intelmq/lib/upgrades.py`.

## Documentation

Expand Down
2 changes: 1 addition & 1 deletion intelmq/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version_info__ = (2, 0, 2, 'alpha', 1)
__version_info__ = (2, 0, 2)
__version__ = '.'.join(map(str, __version_info__))

0 comments on commit ff598e9

Please sign in to comment.