[icinga-checkins] icinga.org: icinga-core/mfriedrich/ido: flag master as 1.7. 0-dev again after full merge from 'next'

git at icinga.org git at icinga.org
Mon Apr 2 14:48:27 CEST 2012


Module: icinga-core
Branch: mfriedrich/ido
Commit: 3a06fdc5755ff95e7c297f0ca31674ab93aa45f6
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=3a06fdc5755ff95e7c297f0ca31674ab93aa45f6

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Feb 29 17:34:44 2012 +0100

flag master as 1.7.0-dev again after full merge from 'next'

---

 configure                        |    2 +-
 configure.in                     |    2 +-
 html/main.html                   |    2 +-
 icinga.spec                      |    2 +-
 include/common.h                 |    2 +-
 module/idoutils/include/common.h |    2 +-
 update-version                   |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index c0d18f3..7a4183d 100755
--- a/configure
+++ b/configure
@@ -2429,7 +2429,7 @@ ac_config_headers="$ac_config_headers include/config.h"
 PKG_NAME=icinga-core
 PKG_VERSION="1.7.0-dev"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="03-01-2012"
+PKG_REL_DATE="02-29-2012"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index 34cc509..ad1695c 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ AC_PREFIX_DEFAULT(/usr/local/icinga)
 PKG_NAME=icinga-core
 PKG_VERSION="1.7.0-dev"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="03-01-2012"
+PKG_REL_DATE="02-29-2012"
 
 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 f127559..495ebdd 100644
--- a/html/main.html
+++ b/html/main.html
@@ -19,7 +19,7 @@
 
 <div id="currentversioninfo">
 <div class="version">Version 1.7.0-dev</div>
-<div class="releasedate">März 01, 2012</div>
+<div class="releasedate">February 29, 2012</div>
 <div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.7.0-dev</a></div>
 </div>
 
diff --git a/icinga.spec b/icinga.spec
index 7b22f69..c4c6503 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -16,7 +16,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.6.1
+Version: 1.7.0-dev
 Release: %{revision}%{?dist}
 License: GPLv2
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index b24f472..11aa862 100644
--- a/include/common.h
+++ b/include/common.h
@@ -28,7 +28,7 @@
 #define PROGRAM_NAME_UC "ICINGA"
 #define PROGRAM_NAME_LC "icinga"
 #define PROGRAM_VERSION "1.7.0-dev"
-#define PROGRAM_MODIFICATION_DATE "03-01-2012"
+#define PROGRAM_MODIFICATION_DATE "02-29-2012"
 
 /*#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 7644455..267194b 100644
--- a/module/idoutils/include/common.h
+++ b/module/idoutils/include/common.h
@@ -22,7 +22,7 @@
 #define LOG2IDO_NAME 		"LOG2IDO"
 
 /* only one space for update-version matching */
-#define IDO_DATE "03-01-2012"
+#define IDO_DATE "02-29-2012"
 #define IDO_VERSION "1.7.0-dev"
 
 #define IDO_SCHEMA_VERSION "1.6.0"
diff --git a/update-version b/update-version
index c92e9cb..1d7eafe 100755
--- a/update-version
+++ b/update-version
@@ -13,7 +13,7 @@ fi
 CURRENTVERSION=1.7.0-dev
 
 # Last date
-LASTDATE=03-01-2012
+LASTDATE=02-29-2012
 
 if [ "x$1" = "x" ]
 then





More information about the icinga-checkins mailing list