[icinga-checkins] icinga.org: icinga-core/feature/exclude-with-regexp-3720: update to 1.9.2

git at icinga.org git at icinga.org
Sat Jul 20 13:54:45 CEST 2013


Module: icinga-core
Branch: feature/exclude-with-regexp-3720
Commit: 74e88fad3ede4e5ccd69380b37a402d703b059aa
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=74e88fad3ede4e5ccd69380b37a402d703b059aa

Author: Michael Friedrich <Michael.Friedrich at netways.de>
Date:   Sat Jun 29 19:32:39 2013 +0200

update to 1.9.2

---

 Changelog                        |    3 ++-
 Makefile.in                      |    2 +-
 configure                        |    4 ++--
 configure.in                     |    4 ++--
 icinga.spec                      |    5 ++++-
 include/common.h                 |    4 ++--
 module/idoutils/include/common.h |    4 ++--
 update-version                   |    4 ++--
 8 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Changelog b/Changelog
index 716f7f6..7956c31 100644
--- a/Changelog
+++ b/Changelog
@@ -13,10 +13,11 @@ UPGRADE NOTES
 	- idoutils: ${source}/module/idoutils/config/updates
 * package locations may differ!
 
-1.9.2 - XX/06/2013
+1.9.2 - 01/07/2013
 
 FIXES
 * core: fix bug with non-ASCII (> 127) illegal macro output characters on char-to-int cast (Jason Young) #4211 - MF
+* core: bail early if main config file cannot be read - MF
 
 * classic ui: fixed searching hostgroup results in wrong 'all' view filter urls #4206 - RB
 * classic ui: fix URL construction issue in icinga_reload_scroll_position() javascript (Karsten Sühring) #4233 - MF
diff --git a/Makefile.in b/Makefile.in
index 1fd2e14..5c8dfb9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,7 +81,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.9.1
+ICINGA_VERSION=1.9.2
 
 CP=@CP@
 
diff --git a/configure b/configure
index 17a90dd..250f34d 100755
--- a/configure
+++ b/configure
@@ -2491,9 +2491,9 @@ ac_config_headers="$ac_config_headers include/config.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.9.1"
+PKG_VERSION="1.9.2"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="05-22-2013"
+PKG_REL_DATE="07-01-2013"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index 4f07823..7e21d67 100644
--- a/configure.in
+++ b/configure.in
@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.9.1"
+PKG_VERSION="1.9.2"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="05-22-2013"
+PKG_REL_DATE="07-01-2013"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
diff --git a/icinga.spec b/icinga.spec
index 00a0916..0257b69 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -20,7 +20,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.9.1
+Version: 1.9.2
 Release: %{revision}%{?dist}
 License: GPLv2
 Group: Applications/System
@@ -438,6 +438,9 @@ fi
 
 
 %changelog
+* Mon Jul 01 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.9.2-1
+- bump 1.9.2
+
 * Wed May 22 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.9.1-1
 - bump 1.9.1
 
diff --git a/include/common.h b/include/common.h
index d5a19b3..a1213ba 100644
--- a/include/common.h
+++ b/include/common.h
@@ -27,8 +27,8 @@
 #define PROGRAM_NAME "Icinga"
 #define PROGRAM_NAME_UC "ICINGA"
 #define PROGRAM_NAME_LC "icinga"
-#define PROGRAM_VERSION "1.9.1"
-#define PROGRAM_MODIFICATION_DATE "05-22-2013"
+#define PROGRAM_VERSION "1.9.2"
+#define PROGRAM_MODIFICATION_DATE "07-01-2013"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/
diff --git a/module/idoutils/include/common.h b/module/idoutils/include/common.h
index e10717c..f60b240 100644
--- a/module/idoutils/include/common.h
+++ b/module/idoutils/include/common.h
@@ -22,8 +22,8 @@
 #define LOG2IDO_NAME 		"LOG2IDO"
 
 /* only one space for update-version matching */
-#define IDO_DATE "05-22-2013"
-#define IDO_VERSION "1.9.1"
+#define IDO_DATE "07-01-2013"
+#define IDO_VERSION "1.9.2"
 
 #define IDO_SCHEMA_VERSION "1.9.0"
 
diff --git a/update-version b/update-version
index 55d6aa2..f90d0ce 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.9.1
+CURRENTVERSION=1.9.2
 
 # Last date
-LASTDATE=05-22-2013
+LASTDATE=07-01-2013
 
 if [ "x$1" = "x" ]
 then





More information about the icinga-checkins mailing list