[icinga-checkins] icinga.org: icinga-core/rbartels/1.3: update master to 1.3.0 target

git at icinga.org git at icinga.org
Thu Nov 11 19:54:25 CET 2010


Module: icinga-core
Branch: rbartels/1.3
Commit: 1c02883588be1b45e60aad937fea47c78304593e
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=1c02883588be1b45e60aad937fea47c78304593e

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Oct 25 09:05:30 2010 +0200

update master to 1.3.0 target

---

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

diff --git a/Changelog b/Changelog
index c79a2d3..e897ae5 100644
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,10 @@
 #######################
-Icinga 1.2.x Change Log
+Icinga 1.3.x Change Log
 #######################
 
+1.3.0 - 16/02/2011
+
+
 1.2.1 - 25/10/2010
 
 ENHANCEMENTS:
diff --git a/Makefile.in b/Makefile.in
index 6be0d04..5dd44d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.2.1
+ICINGA_VERSION=1.3.0
 
 CP=@CP@
 
diff --git a/base/icinga.c b/base/icinga.c
index 954d595..10643f2 100644
--- a/base/icinga.c
+++ b/base/icinga.c
@@ -3,7 +3,7 @@
  * ICINGA.C - Core Program Code For Icinga
  *
  * Program: Icinga
- * Version: 1.2.1
+ * Version: 1.3.0
  * License: GPL
  * Copyright (c) 1999-2009 Ethan Galstad (http://www.nagios.org)
  * Copyright (c) 2009-2010 Icinga Development Team (http://www.icinga.org)
diff --git a/base/icingastats.c b/base/icingastats.c
index fa287ea..7b30c87 100644
--- a/base/icingastats.c
+++ b/base/icingastats.c
@@ -3,7 +3,7 @@
  * ICINGASTATS.C - Displays Icinga Statistics
  *
  * Program: Icingastats
- * Version: 1.2.1
+ * Version: 1.3.0
  * License: GPL
  * Copyright (c) 2003-2008 Ethan Galstad (egalstad at nagios.org)
  * Copyright (c) 2009-2010 Icinga Development Team (http://www.icinga.org)
diff --git a/configure b/configure
index c9cbdef..9b0bcb3 100755
--- a/configure
+++ b/configure
@@ -2368,7 +2368,7 @@ ac_config_headers="$ac_config_headers include/config.h include/snprintf.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.2.1"
+PKG_VERSION="1.3.0"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="10-25-2010"
 
diff --git a/configure.in b/configure.in
index 30c8f20..336bae0 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ AC_CONFIG_HEADER(include/config.h include/snprintf.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.2.1"
+PKG_VERSION="1.3.0"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="10-25-2010"
 
diff --git a/html/main.html b/html/main.html
index 523f134..88d153f 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.2.1</div>
+<div class="version">Version 1.3.0</div>
 <div class="releasedate">October 25, 2010</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.2.1</a></div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.3.0</a></div>
 </div>
 
 
diff --git a/icinga.spec b/icinga.spec
index 1cb3c0f..05804fd 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -17,7 +17,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.2.1
+Version: 1.3.0
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index dbc43ee..ed15ae6 100644
--- a/include/common.h
+++ b/include/common.h
@@ -26,7 +26,7 @@
 #define PROGRAM_NAME "Icinga"
 #define PROGRAM_NAME_UC "ICINGA"
 #define PROGRAM_NAME_LC "icinga"
-#define PROGRAM_VERSION "1.2.1"
+#define PROGRAM_VERSION "1.3.0"
 #define PROGRAM_MODIFICATION_DATE "10-25-2010"
 
 /*#define DEBUG_CHECK_IPC 1 */
diff --git a/module/idoutils/db/scripts/installdb.in b/module/idoutils/db/scripts/installdb.in
index 925f7c3..79bf6a2 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.2.1";
+my $thisversion="1.3.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 48ca592..00734da 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.2.1";
-my $lastversion="1.2.1";
-my $legacyversion="1.2.1";
+my $thisversion="1.3.0";
+my $lastversion="1.3.0";
+my $legacyversion="1.3.0";
 
 $version = $dbh->selectrow_array("SELECT version FROM icinga_dbversion WHERE name='idoutils'");
 if ($version eq "") {
diff --git a/module/idoutils/src/file2sock.c b/module/idoutils/src/file2sock.c
index 157a3ac..cb86932 100644
--- a/module/idoutils/src/file2sock.c
+++ b/module/idoutils/src/file2sock.c
@@ -12,7 +12,7 @@
 #include "../include/common.h"
 #include "../include/io.h"
 
-#define FILE2SOCK_VERSION "1.2.1"
+#define FILE2SOCK_VERSION "1.3.0"
 #define FILE2SOCK_NAME "FILE2SOCK"
 #define FILE2SOCK_DATE "10-25-2010"
 
diff --git a/module/idoutils/src/ido2db.c b/module/idoutils/src/ido2db.c
index 6f62b31..a534b86 100644
--- a/module/idoutils/src/ido2db.c
+++ b/module/idoutils/src/ido2db.c
@@ -29,7 +29,7 @@
 
 #define IDO2DB_NAME "IDO2DB"
 #define IDO2DB_DATE "10-25-2010"
-#define IDO2DB_VERSION "1.2.1"
+#define IDO2DB_VERSION "1.3.0"
 
 extern int use_ssl;
 
diff --git a/module/idoutils/src/idomod.c b/module/idoutils/src/idomod.c
index 634237f..33cab46 100644
--- a/module/idoutils/src/idomod.c
+++ b/module/idoutils/src/idomod.c
@@ -32,7 +32,7 @@
 NEB_API_VERSION(CURRENT_NEB_API_VERSION)
 
 
-#define IDOMOD_VERSION "1.2.1"
+#define IDOMOD_VERSION "1.3.0"
 #define IDOMOD_NAME "IDOMOD"
 #define IDOMOD_DATE "10-25-2010"
 
diff --git a/module/idoutils/src/log2ido.c b/module/idoutils/src/log2ido.c
index b1ad475..cd3e5af 100644
--- a/module/idoutils/src/log2ido.c
+++ b/module/idoutils/src/log2ido.c
@@ -11,7 +11,7 @@
 #include "../include/io.h"
 #include "../include/protoapi.h"
 
-#define LOG2IDO_VERSION "1.2.1"
+#define LOG2IDO_VERSION "1.3.0"
 #define LOG2IDO_NAME "LOG2IDO"
 #define LOG2IDO_DATE "10-25-2010"
 
diff --git a/module/idoutils/src/sockdebug.c b/module/idoutils/src/sockdebug.c
index e68a84c..cb59238 100644
--- a/module/idoutils/src/sockdebug.c
+++ b/module/idoutils/src/sockdebug.c
@@ -9,7 +9,7 @@
 #include "../../../include/config.h"
 #include "../include/io.h"
 
-#define SOCKDEBUG_VERSION "1.2.1"
+#define SOCKDEBUG_VERSION "1.3.0"
 #define SOCKDEBUG_NAME "SOCKDEBUG"
 #define SOCKDEBUG_DATE "10-25-2010"
 
diff --git a/update-version b/update-version
index cb521fc..e5e8eaf 100755
--- a/update-version
+++ b/update-version
@@ -10,7 +10,7 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.2.1
+CURRENTVERSION=1.3.0
 
 # Last date
 LASTDATE=10-25-2010





More information about the icinga-checkins mailing list