[Pkg-nagios-changes] [icinga] 04/06: Imported Upstream version 1.12.2
Alexander Wirt
formorer at debian.org
Thu Mar 12 13:06:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch master
in repository icinga.
commit ffdb8965164355c640cb6612934a86d8d519e136
Author: Alexander Wirt <formorer at debian.org>
Date: Thu Mar 12 13:57:14 2015 +0100
Imported Upstream version 1.12.2
---
Changelog | 14 ++++++++++++++
INSTALLING | 8 ++++----
Makefile.in | 2 +-
configure | 4 ++--
configure.in | 4 ++--
html/main.html | 6 +++---
icinga.spec | 2 +-
include/common.h | 4 ++--
module/idoutils/include/common.h | 4 ++--
update-version | 4 ++--
xdata/xodtemplate.c | 2 +-
11 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/Changelog b/Changelog
index f24d0c7..3ef9910 100644
--- a/Changelog
+++ b/Changelog
@@ -23,6 +23,20 @@ NEWS
* Mailinglists have been migrated to icinga.org. Please check https://www.icinga.org/support for details!
+1.12.2 - 14/02/2015
+
+FIXES
+
+* Bug #3305: Duplicate service definitions are not generating a config validation error
+
+
+1.12.1 - 24/01/2015
+
+FIXES
+
+* Docs - Bug #7801: Add a minified js library for the html docs
+
+
1.12.0 - 19/11/2014
ENHANCEMENTS
diff --git a/INSTALLING b/INSTALLING
index c7c2893..ad5fa36 100644
--- a/INSTALLING
+++ b/INSTALLING
@@ -50,11 +50,11 @@ Here's a short check-list for releases:
$ ./update-version-schema 1.12.1
* Update the Changelog and generate the docs
$ ./configure; make create-docs
-* Commit these changes to the "next" branch and create a signed tag (tags/v<VERSION>).
+* Commit these changes to the "support/1.12" branch and create a signed tag (tags/v<VERSION>).
$ git commit -v -a -m "Release version <VERSION>"
$ git tag -u D14A1F16 -m "Version <VERSION>" v<VERSION>
$ git push --tags
-* Merge the "next" branch into the "master" branch (using --ff-only).
+* Merge the "support/1.12" branch into the "master" branch (using --ff-only).
$ git checkout master
$ git merge --ff-only next
$ git push origin master
@@ -62,12 +62,12 @@ Here's a short check-list for releases:
Use "git archive" to build the release tarball:
-$ VERSION=1.12.1
+$ VERSION=1.12.2
$ git archive --format=tar --prefix=icinga-$VERSION/ tags/v$VERSION | gzip >icinga-$VERSION.tar.gz
Finally you should verify that the tarball only contains the files it should contain:
-$ VERSION=1.12.1
+$ VERSION=1.12.2
$ tar ztf icinga-$VERSION.tar.gz | less
diff --git a/Makefile.in b/Makefile.in
index 2b8b139..d24d955 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,7 +88,7 @@ MKDIR=/bin/mkdir
###############################
# Global
###############################
-ICINGA_VERSION=1.12.1
+ICINGA_VERSION=1.12.2
CP=@CP@
diff --git a/configure b/configure
index e7ad81f..62498af 100755
--- a/configure
+++ b/configure
@@ -2507,9 +2507,9 @@ ac_config_headers="$ac_config_headers include/config.h"
PKG_NAME=icinga-core
-PKG_VERSION="1.12.1"
+PKG_VERSION="1.12.2"
PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="01-24-2015"
+PKG_REL_DATE="02-14-2015"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index 8fd1ecc..406e534 100644
--- a/configure.in
+++ b/configure.in
@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
AC_PREFIX_DEFAULT(/usr/local/icinga)
PKG_NAME=icinga-core
-PKG_VERSION="1.12.1"
+PKG_VERSION="1.12.2"
PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="01-24-2015"
+PKG_REL_DATE="02-14-2015"
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 6711332..f66922c 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
</div>
<div id="currentversioninfo">
-<div class="version">Version 1.12.1</div>
-<div class="releasedate">Januar 24, 2015</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.12.1</a></div>
+<div class="version">Version 1.12.2</div>
+<div class="releasedate">Februar 14, 2015</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.12.2</a></div>
</div>
<div id="developer">
diff --git a/icinga.spec b/icinga.spec
index 376c4a8..3548a77 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -54,7 +54,7 @@
Summary: Open Source host, service and network monitoring program
Name: icinga
-Version: 1.12.1
+Version: 1.12.2
Release: %{revision}%{?dist}
License: GPLv2
Group: Applications/System
diff --git a/include/common.h b/include/common.h
index 0a2a610..34d6ef1 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.12.1"
-#define PROGRAM_MODIFICATION_DATE "01-24-2015"
+#define PROGRAM_VERSION "1.12.2"
+#define PROGRAM_MODIFICATION_DATE "02-14-2015"
/*#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 002e1a8..ef929df 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 "01-24-2015"
-#define IDO_VERSION "1.12.1"
+#define IDO_DATE "02-14-2015"
+#define IDO_VERSION "1.12.2"
#define IDO_SCHEMA_VERSION "1.12.0"
diff --git a/update-version b/update-version
index 9fb0849..5ac2c6a 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
fi
# Current version number
-CURRENTVERSION=1.12.1
+CURRENTVERSION=1.12.2
# Last date
-LASTDATE=01-24-2015
+LASTDATE=02-14-2015
if [ "x$1" = "x" ]
then
diff --git a/xdata/xodtemplate.c b/xdata/xodtemplate.c
index b395196..3815fbb 100644
--- a/xdata/xodtemplate.c
+++ b/xdata/xodtemplate.c
@@ -4302,7 +4302,7 @@ int xodtemplate_duplicate_services(void) {
}
}
- return OK;
+ return result;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/icinga.git
More information about the Pkg-nagios-changes
mailing list