Skip to content

Commit

Permalink
Merge pull request #2490 from certtools/missing-release-steps
Browse files Browse the repository at this point in the history
Missing release steps, add changelog entries
  • Loading branch information
sebix authored Apr 9, 2024
2 parents 4eb0f7a + ba1df21 commit 188f091
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 6 deletions.
35 changes: 35 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,41 @@
# CHANGELOG


3.3.1 (unreleased)
------------------

### Configuration

### Core

### Development

### Data Format

### Bots
#### Collectors

#### Parsers
- `intelmq.bots.parsers.shadowserver._config`:
- Fetch schema before first run (PR#2482 by elsif2, fixes #2480).
- `intelmq.bots.parsers.dataplane.parser`: Use ` | ` as field delimiter, fix parsing of AS names including `|` (PR#2488 by DigitalTrustCenter).

#### Experts

#### Outputs

### Documentation

### Packaging

### Tests

### Tools

### Contrib

### Known issues


3.3.0 (2024-03-01)
------------------
Expand Down
20 changes: 18 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,24 @@ This file lists all changes which have an affect on the administration of IntelM
Please refer to the change log for a full list of changes.


3.3.0 Feature release (2024-03-01)
---------------------
3.3.0 Bugfix release (unreleased)
---------------------------------

### Requirements

### Tools

### Data Format

### Configuration

### Libraries

### Postgres databases


3.3.0 Feature release (2024-03-01)
----------------------------------

### Documentation
The documentation is now available at [docs.intelmq.org](https://docs.intelmq.org/). Documentation has been updated and restructured into User, Administrator and Developer Guide. It provides modern look with various quality of life improvements. Big thanks to to @gethvi.
Expand Down
8 changes: 7 additions & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
intelmq (3.3.1~a1-1) UNRELEASED; urgency=medium

* 3.3.1 Bugfix release

-- Sebastian Wagner <[email protected]> Thu, 04 Apr 2024 10:40:34 +0200

intelmq (3.3.0-1) stable; urgency=medium

* 3.3.0 Feature release

-- Aaron Kaplan <[email protected]> Fr, 01 Mar 2024 14:19:00 +0100
-- Aaron Kaplan <[email protected]> Fri, 01 Mar 2024 14:19:00 +0100

intelmq (3.2.1-2) stable; urgency=medium

Expand Down
4 changes: 3 additions & 1 deletion intelmq/lib/upgrades.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
'v310_shadowserver_feednames',
'v320_update_turris_greylist_url',
'v322_url_replacement',
'v322_removed_feeds_and_bots'
'v322_removed_feeds_and_bots',
]


Expand Down Expand Up @@ -979,6 +979,8 @@ def v322_removed_feeds_and_bots(configuration, harmonization, dry_run, **kwargs)
((3, 1, 0), (v310_feed_changes, v310_shadowserver_feednames)),
((3, 2, 0), (v320_update_turris_greylist_url,)),
((3, 2, 2), (v322_url_replacement, v322_removed_feeds_and_bots)),
((3, 3, 0), ()),
((3, 3, 1), ()),
])

ALWAYS = (harmonization,)
4 changes: 2 additions & 2 deletions intelmq/version.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2016-2023 Sebastian Wagner
# SPDX-FileCopyrightText: 2016-2024 Sebastian Wagner
#
# SPDX-License-Identifier: AGPL-3.0-or-later

__version_info__ = (3, 3, 0)
__version_info__ = (3, 3, 1, 'alpha1')
__version__ = '.'.join(map(str, __version_info__))

0 comments on commit 188f091

Please sign in to comment.