[icinga-checkins] icinga.org: icinga-core/r1.2: update release branch for next intermediate release (tba)

git at icinga.org git at icinga.org
Tue Nov 9 08:24:14 CET 2010


Module: icinga-core
Branch: r1.2
Commit: f61b667661d60b2c454e55d702f91a97ac1b4c29
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=f61b667661d60b2c454e55d702f91a97ac1b4c29

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov  9 08:23:45 2010 +0100

update release branch for next intermediate release (tba)

---

 Makefile.in                             |    2 +-
 base/icinga.c                           |    2 +-
 base/icingastats.c                      |    2 +-
 configure                               |    4 ++--
 configure.in                            |    4 ++--
 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/src/file2sock.c         |    4 ++--
 module/idoutils/src/ido2db.c            |    4 ++--
 module/idoutils/src/idomod.c            |    4 ++--
 module/idoutils/src/log2ido.c           |    4 ++--
 module/idoutils/src/sockdebug.c         |    4 ++--
 update-version                          |    4 ++--
 16 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7193dda..abc1607 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.3.0
+ICINGA_VERSION=1.2.2
 
 CP=@CP@
 
diff --git a/base/icinga.c b/base/icinga.c
index 10643f2..fc3be32 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.2.2
  * 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 7b30c87..867e8f5 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.2.2
  * 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 8af5d51..65f6ca4 100755
--- a/configure
+++ b/configure
@@ -2367,9 +2367,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.2.2"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="10-25-2010"
+PKG_REL_DATE="11-09-2010"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index 9e3f353..aaa31f3 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.2.2"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="10-25-2010"
+PKG_REL_DATE="11-09-2010"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
diff --git a/html/main.html b/html/main.html
index 88d153f..f50922c 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">October 25, 2010</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.2.2</div>
+<div class="releasedate">November 09, 2010</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.2.2</a></div>
 </div>
 
 
diff --git a/icinga.spec b/icinga.spec
index 89eaa92..2d19eec 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -17,7 +17,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.3.0
+Version: 1.2.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index 1cf147f..589ab5b 100644
--- a/include/common.h
+++ b/include/common.h
@@ -26,8 +26,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 "10-25-2010"
+#define PROGRAM_VERSION "1.2.2"
+#define PROGRAM_MODIFICATION_DATE "11-09-2010"
 
 /*#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 79bf6a2..01931ee 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.2.2";
 
 # 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 00734da..11ff82c 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.2.2";
+my $lastversion="1.2.2";
+my $legacyversion="1.2.2";
 
 $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 cb86932..92fdc04 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.2.2"
 #define FILE2SOCK_NAME "FILE2SOCK"
-#define FILE2SOCK_DATE "10-25-2010"
+#define FILE2SOCK_DATE "11-09-2010"
 
 
 int process_arguments(int,char **);
diff --git a/module/idoutils/src/ido2db.c b/module/idoutils/src/ido2db.c
index a534b86..dc4fedb 100644
--- a/module/idoutils/src/ido2db.c
+++ b/module/idoutils/src/ido2db.c
@@ -28,8 +28,8 @@
 #endif
 
 #define IDO2DB_NAME "IDO2DB"
-#define IDO2DB_DATE "10-25-2010"
-#define IDO2DB_VERSION "1.3.0"
+#define IDO2DB_DATE "11-09-2010"
+#define IDO2DB_VERSION "1.2.2"
 
 extern int use_ssl;
 
diff --git a/module/idoutils/src/idomod.c b/module/idoutils/src/idomod.c
index 33cab46..028b583 100644
--- a/module/idoutils/src/idomod.c
+++ b/module/idoutils/src/idomod.c
@@ -32,9 +32,9 @@
 NEB_API_VERSION(CURRENT_NEB_API_VERSION)
 
 
-#define IDOMOD_VERSION "1.3.0"
+#define IDOMOD_VERSION "1.2.2"
 #define IDOMOD_NAME "IDOMOD"
-#define IDOMOD_DATE "10-25-2010"
+#define IDOMOD_DATE "11-09-2010"
 
 
 void *idomod_module_handle=NULL;
diff --git a/module/idoutils/src/log2ido.c b/module/idoutils/src/log2ido.c
index cd3e5af..9c92d8e 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.2.2"
 #define LOG2IDO_NAME "LOG2IDO"
-#define LOG2IDO_DATE "10-25-2010"
+#define LOG2IDO_DATE "11-09-2010"
 
 
 
diff --git a/module/idoutils/src/sockdebug.c b/module/idoutils/src/sockdebug.c
index cb59238..c314d19 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.2.2"
 #define SOCKDEBUG_NAME "SOCKDEBUG"
-#define SOCKDEBUG_DATE "10-25-2010"
+#define SOCKDEBUG_DATE "11-09-2010"
 
 
 int cleanup_socket(int,char *);
diff --git a/update-version b/update-version
index e5e8eaf..29d55b5 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.3.0
+CURRENTVERSION=1.2.2
 
 # Last date
-LASTDATE=10-25-2010
+LASTDATE=11-09-2010
 
 if [ "x$1" = "x" ]
 then





More information about the icinga-checkins mailing list