Release version 2.3.1

diff --git a/ChangeLog b/ChangeLog
index 6cde915b08ae756e53c4c29f859ca9b225fd90d2..a62ae0bbbd9e7e33a64d28f34572832f10549472 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,30 @@ Please check [doc/1-about.md].
 
 ## What's New
 
+### What's New in Version 2.3.1
+
+#### Changes
+
+* Bugfixes
+
+Please note that this version fixes the default thresholds for the disk check which were inadvertently broken in 2.3.0; if you're using percent-based custom thresholds you will need to add the '%' sign to your custom attributes
+
+#### Issues
+
+* Feature 8659: Implement String#contains
+
+* Bug 8540: Kill signal sent only to check process, not whole process group
+* Bug 8657: Missing program name in 'icinga2 --version'
+* Bug 8658: Fix check_disk thresholds: make sure partitions are the last arguments
+* Bug 8672: Api heartbeat message response time problem
+* Bug 8673: Fix check_disk default thresholds and document the change of unit
+* Bug 8679: Config validation fail because of unexpected new-line
+* Bug 8680: Update documentation for DB IDO HA Run-Once
+* Bug 8683: Make sure that the /var/log/icinga2/crash directory exists
+* Bug 8684: Fix formatting for the GDB stacktrace
+* Bug 8687: Crash in Dependency::Stop
+* Bug 8691: Debian packages do not create /var/log/icinga2/crash
+
 ### What's New in Version 2.3.0
 
 #### Changes

diff --git a/INSTALL.md b/INSTALL.md
index 2fcf4c79edaab91afe3d8b02b5f24d818d51677c..ff5f7e9bf01069a9c12ed2207225e0a32b8b8207 100644 (file)
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -95,11 +95,11 @@ Push the tag.
 
     $ git push --tags
 
-Merge the "master" branch into the "support/2.2" branch (using --ff-only).
+Merge the "master" branch into the "support/2.3" branch (using --ff-only).
 
-    $ git checkout support/2.2
+    $ git checkout support/2.3
     $ git merge --ff-only master
-    $ git push origin support/2.2
+    $ git push origin support/2.3
 
 Note: CMake determines the Icinga 2 version number using `git describe` if the
 source directory is contained in a Git repository. Otherwise the version number
@@ -112,12 +112,12 @@ disable the usage of `git describe`.
 
 Use `git archive` to build the release tarball:
 
-    $ VERSION=2.3.0
+    $ VERSION=2.3.1
     $ 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.3.0
+    $ VERSION=2.3.1
     $ tar ztf icinga2-$VERSION.tar.gz | less
 
 
@@ -186,11 +186,11 @@ Icinga 2 comes with a single binary that takes care of loading all the relevant
 components (e.g. for check execution, notifications, etc.):
 
     # /usr/sbin/icinga2 daemon
-    [2014-12-18 10:20:49 +0100] information/cli: Icinga application loader (version: v2.2.2)
-    [2014-12-18 10:20:49 +0100] information/cli: Loading application type: icinga/IcingaApplication
-    [2014-12-18 10:20:49 +0100] information/Utility: Loading library 'libicinga.so'
-    [2014-12-18 10:20:49 +0100] information/ConfigCompiler: Compiling config file: /home/gbeutner/i2/etc/icinga2/icinga2.conf
-    [2014-12-18 10:20:49 +0100] information/ConfigCompiler: Compiling config file: /home/gbeutner/i2/etc/icinga2/constants.conf
+    [2015-03-12 13:25:56 +0100] information/cli: Icinga application loader (version: v2.3.0-20-ga4d3713; debug)
+    [2015-03-12 13:25:56 +0100] information/cli: Loading application type: icinga/IcingaApplication
+    [2015-03-12 13:25:56 +0100] information/Utility: Loading library 'libicinga.dylib'
+    [2015-03-12 13:25:56 +0100] information/ConfigCompiler: Compiling config file: /Users/gunnar/i2/etc/icinga2/icinga2.conf
+    [2015-03-12 13:25:56 +0100] information/ConfigCompiler: Compiling config file: /Users/gunnar/i2/etc/icinga2/constants.conf
     ...
 
 Icinga 2 can be started as daemon using the provided init script:

diff --git a/doc/1-about.md b/doc/1-about.md
index e45255374c00fd4a2207537095523fc4f7d62c1b..05fe7934c4492a0527ac3fafa99b7c8ccd4437c7 100644 (file)
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -54,6 +54,30 @@ More details in the [Icinga FAQ](https://www.icinga.org/icinga/faq/).
 
 ## <a id="whats-new"></a> What's New
 
+### What's New in Version 2.3.1
+
+#### Changes
+
+* Bugfixes
+
+Please note that this version fixes the default thresholds for the disk check which were inadvertently broken in 2.3.0; if you're using percent-based custom thresholds you will need to add the '%' sign to your custom attributes
+
+#### Issues
+
+* Feature 8659: Implement String#contains
+
+* Bug 8540: Kill signal sent only to check process, not whole process group
+* Bug 8657: Missing program name in 'icinga2 --version'
+* Bug 8658: Fix check_disk thresholds: make sure partitions are the last arguments
+* Bug 8672: Api heartbeat message response time problem
+* Bug 8673: Fix check_disk default thresholds and document the change of unit
+* Bug 8679: Config validation fail because of unexpected new-line
+* Bug 8680: Update documentation for DB IDO HA Run-Once
+* Bug 8683: Make sure that the /var/log/icinga2/crash directory exists
+* Bug 8684: Fix formatting for the GDB stacktrace
+* Bug 8687: Crash in Dependency::Stop
+* Bug 8691: Debian packages do not create /var/log/icinga2/crash
+
 ### What's New in Version 2.3.0
 
 #### Changes

diff --git a/icinga2.spec b/icinga2.spec
index 927aa3dafcc9b8562fa57a1b531e37e07cd31d21..9241f3a4bcee743c5f02ba69ef14105b164edb3a 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.3.0
+Version: 2.3.1
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System