Skip to content

Commit

Permalink
Merge branch 'openvas-21.04' into mergify/bp/openvas-21.04/pr-702
Browse files Browse the repository at this point in the history
  • Loading branch information
jjnicola authored Apr 16, 2021
2 parents 0933b55 + a2fc36f commit 328e75e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [21.04.1] (unreleased)

### Added
### Changed
### Fixed
### Removed

[21.04.1]: https://github.com/greenbone/openvas/compare/v21.4.0...openvas-21.04


## [21.04.0] (2021-04-15)

### Added
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ message ("-- Configuring the Scanner...")

# VERSION: Always include major, minor and patch level.
project (openvas
VERSION 21.4.0
VERSION 21.4.1
LANGUAGES C)

if (POLICY CMP0005)
Expand Down
2 changes: 1 addition & 1 deletion misc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -fPIC")
# we require CMake >= 3.0
set (MISC_VERSION_MAJOR 21)
set (MISC_VERSION_MINOR 4)
set (MISC_VERSION_PATCH 0)
set (MISC_VERSION_PATCH 1)

if (PROJECT_BETA_RELEASE)
set (MISC_VERSION_SUFFIX "+beta${PROJECT_BETA_RELEASE}")
Expand Down
2 changes: 1 addition & 1 deletion nasl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# we require CMake >= 3.0
set (NASL_VERSION_MAJOR 21)
set (NASL_VERSION_MINOR 4)
set (NASL_VERSION_PATCH 0)
set (NASL_VERSION_PATCH 1)

if (PROJECT_BETA_RELEASE)
set (NASL_VERSION_SUFFIX "+beta${PROJECT_BETA_RELEASE}")
Expand Down

0 comments on commit 328e75e

Please sign in to comment.