[icinga-checkins] icinga.org: icinga-core/master: target master as 1.7.0-dev

git at icinga.org git at icinga.org
Fri Dec 2 21:16:41 CET 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Dec  2 21:16:24 2011 +0100

target master as 1.7.0-dev

---

 Makefile.in                      |    2 +-
 configure                        |    4 ++--
 configure.in                     |    4 ++--
 docbook                          |    2 +-
 html/main.html                   |    6 +++---
 icinga.spec                      |    2 +-
 include/common.h                 |    4 ++--
 module/idoutils/include/common.h |    4 ++--
 update-version                   |    4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index cae7651..3ccd65f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,7 +77,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.6.1
+ICINGA_VERSION=1.7.0-dev
 
 CP=@CP@
 
diff --git a/configure b/configure
index 3dda123..cdb4873 100755
--- a/configure
+++ b/configure
@@ -2421,9 +2421,9 @@ ac_config_headers="$ac_config_headers include/config.h include/snprintf.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.6.1"
+PKG_VERSION="1.7.0-dev"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="12-02-2011"
+PKG_REL_DATE="03-01-2012"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index f94110c..bfcc367 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.6.1"
+PKG_VERSION="1.7.0-dev"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="12-02-2011"
+PKG_REL_DATE="03-01-2012"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
diff --git a/docbook b/docbook
index 70fd3d1..d606e69 160000
--- a/docbook
+++ b/docbook
@@ -1 +1 @@
-Subproject commit 70fd3d10a04eb2550c8e95a86a290257f5275172
+Subproject commit d606e69b157a972f0c99995d0622359ec951adfa
diff --git a/html/main.html b/html/main.html
index 2108ad8..1e7b2ba 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.6.1</div>
-<div class="releasedate">Dezember 02, 2011</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.6.1</a></div>
+<div class="version">Version 1.7.0-dev</div>
+<div class="releasedate">März 01, 2012</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.7.0-dev</a></div>
 </div>
 
 <div id="developer">
diff --git a/icinga.spec b/icinga.spec
index de302d4..7904f55 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -14,7 +14,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.6.1
+Version: 1.7.0-dev
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index 7b3a058..dcd6bf0 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.6.1"
-#define PROGRAM_MODIFICATION_DATE "12-02-2011"
+#define PROGRAM_VERSION "1.7.0-dev"
+#define PROGRAM_MODIFICATION_DATE "03-01-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 caee60b..f3f867e 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 "12-02-2011"
-#define IDO_VERSION "1.6.1"
+#define IDO_DATE "03-01-2012"
+#define IDO_VERSION "1.7.0-dev"
 
 #define IDO_SCHEMA_VERSION "1.6.0"
 
diff --git a/update-version b/update-version
index 12379c8..c92e9cb 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.6.1
+CURRENTVERSION=1.7.0-dev
 
 # Last date
-LASTDATE=12-02-2011
+LASTDATE=03-01-2012
 
 if [ "x$1" = "x" ]
 then





More information about the icinga-checkins mailing list