[icinga-checkins] icinga.org: icinga-core/master: bump master to 1.4.0

git at icinga.org git at icinga.org
Mon Mar 14 17:49:08 CET 2011


Module: icinga-core
Branch: master
Commit: 9f60180bf66f084ae7b121f3a19e9cfa450b8717
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=9f60180bf66f084ae7b121f3a19e9cfa450b8717

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Mar 14 17:48:47 2011 +0100

bump master to 1.4.0

---

 Doxyfile                                |    2 +-
 Makefile.in                             |    2 +-
 base/icinga.c                           |    2 +-
 base/icingastats.c                      |    2 +-
 configure                               |    4 ++--
 configure.in                            |    4 ++--
 docbook                                 |    2 +-
 html/main.html                          |    6 +++---
 icinga.spec                             |    2 +-
 include/common.h                        |    4 ++--
 module/idoutils/db/scripts/installdb.in |    2 +-
 module/idoutils/db/scripts/upgradedb.in |    6 +++---
 module/idoutils/include/ido2db.h        |    4 ++--
 module/idoutils/include/idomod.h        |    4 ++--
 module/idoutils/src/file2sock.c         |    4 ++--
 module/idoutils/src/log2ido.c           |    4 ++--
 module/idoutils/src/sockdebug.c         |    4 ++--
 update-version                          |    4 ++--
 18 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/Doxyfile b/Doxyfile
index 3d6d6c2..5376d2e 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = icinga-core
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.3.0
+PROJECT_NUMBER         = 1.4.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/Makefile.in b/Makefile.in
index bc343ad..6736d19 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.3.0
+ICINGA_VERSION=1.4.0
 
 CP=@CP@
 
diff --git a/base/icinga.c b/base/icinga.c
index f914053..4cbf8de 100644
--- a/base/icinga.c
+++ b/base/icinga.c
@@ -3,7 +3,7 @@
  * ICINGA.C - Core Program Code For Icinga
  *
  * Program: Icinga
- * Version: 1.3.0
+ * Version: 1.4.0
  * License: GPL
  * Copyright (c) 1999-2009 Ethan Galstad (http://www.nagios.org)
  * Copyright (c) 2009-2011 Nagios Core Development Team and Community Contributors
diff --git a/base/icingastats.c b/base/icingastats.c
index eab200d..899fbde 100644
--- a/base/icingastats.c
+++ b/base/icingastats.c
@@ -3,7 +3,7 @@
  * ICINGASTATS.C - Displays Icinga Statistics
  *
  * Program: Icingastats
- * Version: 1.3.0
+ * Version: 1.4.0
  * License: GPL
  * Copyright (c) 2003-2008 Ethan Galstad (egalstad at nagios.org)
  * Copyright (c) 2009-2011 Nagios Core Development Team and Community Contributors
diff --git a/configure b/configure
index 54a6cb1..39a3431 100755
--- a/configure
+++ b/configure
@@ -2371,9 +2371,9 @@ ac_config_headers="$ac_config_headers include/config.h include/snprintf.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.3.0"
+PKG_VERSION="1.4.0"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="02-16-2011"
+PKG_REL_DATE="05-11-2011"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index 6326d8e..1246599 100644
--- a/configure.in
+++ b/configure.in
@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h include/snprintf.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.3.0"
+PKG_VERSION="1.4.0"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="02-16-2011"
+PKG_REL_DATE="05-11-2011"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
diff --git a/docbook b/docbook
index 690effb..ae636a7 160000
--- a/docbook
+++ b/docbook
@@ -1 +1 @@
-Subproject commit 690effbe7a4b413e25adf14763b7e0aebb238e25
+Subproject commit ae636a767ca3c38b6b99451f1a64a133c05753b6
diff --git a/html/main.html b/html/main.html
index 4abdcca..d33b495 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.3.0</div>
-<div class="releasedate">February 16, 2011</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.3.0</a></div>
+<div class="version">Version 1.4.0</div>
+<div class="releasedate">May 11, 2011</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.4.0</a></div>
 </div>
 
 <div id="developer">
diff --git a/icinga.spec b/icinga.spec
index e016cea..cf6b9f7 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -11,7 +11,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.3.0
+Version: 1.4.0
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index ddb0a9d..0f61466 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.3.0"
-#define PROGRAM_MODIFICATION_DATE "02-16-2011"
+#define PROGRAM_VERSION "1.4.0"
+#define PROGRAM_MODIFICATION_DATE "05-11-2011"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/
diff --git a/module/idoutils/db/scripts/installdb.in b/module/idoutils/db/scripts/installdb.in
index 537a684..51cef88 100755
--- a/module/idoutils/db/scripts/installdb.in
+++ b/module/idoutils/db/scripts/installdb.in
@@ -45,7 +45,7 @@ my $dbh = DBI->connect("DBI:mysql:database=$database;host=$hostname",
 		or die "Cannot connect to database";
 
 # Current database version
-my $thisversion="1.3.0";
+my $thisversion="1.4.0";
 
 # Create version table if it doesn't exist
 eval { $dbh->do("SELECT * FROM icinga_dbversion LIMIT 1") };
diff --git a/module/idoutils/db/scripts/upgradedb.in b/module/idoutils/db/scripts/upgradedb.in
index b7260c1..fc8fd88 100755
--- a/module/idoutils/db/scripts/upgradedb.in
+++ b/module/idoutils/db/scripts/upgradedb.in
@@ -53,9 +53,9 @@ if ($@) {
 
 # Get current database version
 my $version;
-my $thisversion="1.3.0";
-my $lastversion="1.3.0";
-my $legacyversion="1.3.0";
+my $thisversion="1.4.0";
+my $lastversion="1.4.0";
+my $legacyversion="1.4.0";
 
 $version = $dbh->selectrow_array("SELECT version FROM icinga_dbversion WHERE name='idoutils'");
 if ($version eq "") {
diff --git a/module/idoutils/include/ido2db.h b/module/idoutils/include/ido2db.h
index d2698f8..1bf6caf 100644
--- a/module/idoutils/include/ido2db.h
+++ b/module/idoutils/include/ido2db.h
@@ -13,8 +13,8 @@
 #include "utils.h"
 
 #define IDO2DB_NAME "IDO2DB"
-#define IDO2DB_DATE "02-16-2011"
-#define IDO2DB_VERSION "1.3.0"
+#define IDO2DB_DATE "05-11-2011"
+#define IDO2DB_VERSION "1.4.0"
 
 /*************** RDBMS headers *************/
 
diff --git a/module/idoutils/include/idomod.h b/module/idoutils/include/idomod.h
index 3408ecb..85c0e33 100644
--- a/module/idoutils/include/idomod.h
+++ b/module/idoutils/include/idomod.h
@@ -9,9 +9,9 @@
 #ifndef _NDBXT_IDOMOD_H
 #define _NDBXT_IDOMOD_H
 
-#define IDOMOD_VERSION "1.3.0"
+#define IDOMOD_VERSION "1.4.0"
 #define IDOMOD_NAME "IDOMOD"
-#define IDOMOD_DATE "02-16-2011"
+#define IDOMOD_DATE "05-11-2011"
 
 /************** misc definitions *************/
 
diff --git a/module/idoutils/src/file2sock.c b/module/idoutils/src/file2sock.c
index 94a9601..782d44f 100644
--- a/module/idoutils/src/file2sock.c
+++ b/module/idoutils/src/file2sock.c
@@ -12,9 +12,9 @@
 #include "../include/common.h"
 #include "../include/io.h"
 
-#define FILE2SOCK_VERSION "1.3.0"
+#define FILE2SOCK_VERSION "1.4.0"
 #define FILE2SOCK_NAME "FILE2SOCK"
-#define FILE2SOCK_DATE "02-16-2011"
+#define FILE2SOCK_DATE "05-11-2011"
 
 
 int process_arguments(int,char **);
diff --git a/module/idoutils/src/log2ido.c b/module/idoutils/src/log2ido.c
index 508407b..120d1b7 100644
--- a/module/idoutils/src/log2ido.c
+++ b/module/idoutils/src/log2ido.c
@@ -11,9 +11,9 @@
 #include "../include/io.h"
 #include "../include/protoapi.h"
 
-#define LOG2IDO_VERSION "1.3.0"
+#define LOG2IDO_VERSION "1.4.0"
 #define LOG2IDO_NAME "LOG2IDO"
-#define LOG2IDO_DATE "02-16-2011"
+#define LOG2IDO_DATE "05-11-2011"
 
 
 
diff --git a/module/idoutils/src/sockdebug.c b/module/idoutils/src/sockdebug.c
index dae90e0..2db11c6 100644
--- a/module/idoutils/src/sockdebug.c
+++ b/module/idoutils/src/sockdebug.c
@@ -9,9 +9,9 @@
 #include "../../../include/config.h"
 #include "../include/io.h"
 
-#define SOCKDEBUG_VERSION "1.3.0"
+#define SOCKDEBUG_VERSION "1.4.0"
 #define SOCKDEBUG_NAME "SOCKDEBUG"
-#define SOCKDEBUG_DATE "02-16-2011"
+#define SOCKDEBUG_DATE "05-11-2011"
 
 
 int cleanup_socket(int,char *);
diff --git a/update-version b/update-version
index b05ea23..e7e7ad6 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.3.0
+CURRENTVERSION=1.4.0
 
 # Last date
-LASTDATE=02-16-2011
+LASTDATE=05-11-2011
 
 if [ "x$1" = "x" ]
 then





More information about the icinga-checkins mailing list