diff --git a/.mailmap b/.mailmap index 140198f413b..a02360e650d 100644 --- a/.mailmap +++ b/.mailmap @@ -3,3 +3,4 @@ Gunnar Beutner + diff --git a/ChangeLog b/ChangeLog index 1dd382ed5c1..4af5217d1ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,26 @@ Please check [doc/1-about.md]. ## What's New +### What's New in Version 2.2.3 + +#### Changes + +* Bugfixes + +#### Issues + +* Bug #8063: Volatile checks trigger invalid notifications on OK->OK state changes +* Bug #8125: Incorrect ticket shouldn't cause "node wizard" to terminate +* Bug #8126: Icinga 2.2.2 doesn't build on i586 SUSE distributions +* Bug #8143: Windows plugin check_service.exe can't find service NTDS +* Bug #8144: Arguments without values are not used on plugin exec +* Bug #8147: check_interval must be greater than 0 error on update-config +* Bug #8152: DB IDO query queue limit reached on reload +* Bug #8171: Typo in example of StatusDataWriter +* Bug #8178: Icinga 2.2.2 segfaults on FreeBSD +* Bug #8181: icinga2 node update config shows hex instead of human readable names +* Bug #8182: Segfault on update-config old empty config + ### What's New in Version 2.2.2 #### Changes diff --git a/INSTALL.md b/INSTALL.md index a3dd3ba17a5..e4fc2bca423 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -76,7 +76,8 @@ Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files $ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS Bump the version in icinga2.spec. -Update the [ChangeLog](ChangeLog) and [doc/1-about.md](doc/1-about.md) files. +Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) and [INSTALL.md](INSTALL.md) +files. Commit these changes to the "master" branch. $ git commit -v -a -m "Release version " @@ -89,11 +90,11 @@ GB: MF: $ git tag -u D14A1F16 -m "Version " v - + Push the tag. $ git push --tags - + Merge the "master" branch into the "support/2.2" branch (using --ff-only). $ git checkout support/2.2 @@ -111,12 +112,12 @@ disable the usage of `git describe`. Use `git archive` to build the release tarball: - $ VERSION=2.2.2 + $ VERSION=2.2.3 $ git archive --format=tar --prefix=icinga2-$VERSION/ tags/v$VERSION | gzip >icinga2-$VERSION.tar.gz Finally you should verify that the tarball only contains the files it should contain: - $ VERSION=2.2.2 + $ VERSION=2.2.3 $ tar ztf icinga2-$VERSION.tar.gz | less @@ -145,12 +146,12 @@ variables are supported: - `ICINGA2_PLUGINDIR`: The path for the Monitoring Plugins project binaries; defaults to `/usr/lib/nagios/plugins` - `ICINGA2_RUNDIR`: The location of the "run" directory; defaults to `CMAKE_INSTALL_LOCALSTATEDIR/run` - `CMAKE_INSTALL_SYSCONFDIR`: The configuration directory; defaults to `CMAKE_INSTALL_PREFIX/etc` -- `ICINGA2_SYSCONFIGFILE`: Where to put the config file the initscript/systemd pulls it's dirs from; +- `ICINGA2_SYSCONFIGFILE`: Where to put the config file the initscript/systemd pulls it's dirs from; defaults to `CMAKE_INSTALL_PREFIX/etc/sysconfig/icinga2` - `CMAKE_INSTALL_LOCALSTATEDIR`: The state directory; defaults to `CMAKE_INSTALL_PREFIX/var` - `USE_SYSTEMD=ON|OFF`: Use systemd or a classic SysV initscript; defaults to `OFF` -- `INSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON|OFF` Force install both the systemd service definition file -and the SysV initscript in parallel, regardless of how `USE_SYSTEMD` is set. +- `INSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON|OFF` Force install both the systemd service definition file +and the SysV initscript in parallel, regardless of how `USE_SYSTEMD` is set. Only use this for special packaging purposes and if you know what you are doing. Defaults to `OFF`. - `ICINGA2_WITH_MYSQL`: Determines whether the MySQL IDO module is built; defaults to `ON` diff --git a/doc/1-about.md b/doc/1-about.md index ce3e4d975e8..c49958ae96f 100644 --- a/doc/1-about.md +++ b/doc/1-about.md @@ -54,6 +54,26 @@ Icinga 2 is available as [Vagrant Demo VM](#vagrant). ## What's new +### What's New in Version 2.2.3 + +#### Changes + +* Bugfixes + +#### Issues + +* Bug #8063: Volatile checks trigger invalid notifications on OK->OK state changes +* Bug #8125: Incorrect ticket shouldn't cause "node wizard" to terminate +* Bug #8126: Icinga 2.2.2 doesn't build on i586 SUSE distributions +* Bug #8143: Windows plugin check_service.exe can't find service NTDS +* Bug #8144: Arguments without values are not used on plugin exec +* Bug #8147: check_interval must be greater than 0 error on update-config +* Bug #8152: DB IDO query queue limit reached on reload +* Bug #8171: Typo in example of StatusDataWriter +* Bug #8178: Icinga 2.2.2 segfaults on FreeBSD +* Bug #8181: icinga2 node update config shows hex instead of human readable names +* Bug #8182: Segfault on update-config old empty config + ### What's New in Version 2.2.2 #### Changes diff --git a/icinga2.spec b/icinga2.spec index 71915ed06e6..0e1eed2ce25 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -66,7 +66,7 @@ Summary: Network monitoring application Name: icinga2 -Version: 2.2.2 +Version: 2.2.3 Release: %{revision}%{?dist} License: GPL-2.0+ Group: Applications/System