From 5682db0eae739bb1d1a622b9e8f57819aa74b12e Mon Sep 17 00:00:00 2001 From: "John C. Frickson" Date: Tue, 18 Aug 2015 10:03:53 -0500 Subject: [PATCH] Prep for release 4.1.0 --- Changelog | 3 ++- configure | 4 ++-- configure.in | 4 ++-- doxy.conf | 2 +- html/main.php | 4 ++-- html/side.php | 2 +- include/common.h | 4 ++-- nagios.spec | 2 +- update-version | 4 ++-- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Changelog b/Changelog index 98d65d3b0..bee8ce6ad 100644 --- a/Changelog +++ b/Changelog @@ -2,7 +2,7 @@ Nagios Core 4 Change Log ######################## -4.1.0 - xx/xx/xxxx +4.1.0 - 08/18/2015 ------------------ ENHANCEMENTS * Promoted JSON CGIs to released status (Eric Stanley) @@ -12,6 +12,7 @@ ENHANCEMENTS * httpd.conf doesn't support Apache versions > 2.3 (DanielB / John Frickson) FIXES +* Fix for not all service dependencies created (John Frickson) * Fix SIGSEGV with empty custom variable (orbis / John Frickson) * Fix contact macros in environment variables (dvoryanchikov) * Fixed host's current attempt goes to 1 after going to hard state (John Frickson) diff --git a/configure b/configure index 8f5ca5960..5c94587ea 100755 --- a/configure +++ b/configure @@ -1873,9 +1873,9 @@ ac_config_headers="$ac_config_headers include/config.h lib/snprintf.h lib/iobrok PKG_NAME=nagios -PKG_VERSION="4.1.0rc3" +PKG_VERSION="4.1.0" PKG_HOME_URL="https://www.nagios.org/" -PKG_REL_DATE="08-11-2015" +PKG_REL_DATE="08-18-2015" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do diff --git a/configure.in b/configure.in index 6ce69bc2a..7a50929b6 100644 --- a/configure.in +++ b/configure.in @@ -10,9 +10,9 @@ AC_PREFIX_DEFAULT(/usr/local/nagios) PKG_NAME=nagios -PKG_VERSION="4.1.0rc3" +PKG_VERSION="4.1.0" PKG_HOME_URL="https://www.nagios.org/" -PKG_REL_DATE="08-11-2015" +PKG_REL_DATE="08-18-2015" dnl Figure out how to invoke "install" and what install options to use. AC_PROG_INSTALL diff --git a/doxy.conf b/doxy.conf index 4a2894e96..b9e38de25 100644 --- a/doxy.conf +++ b/doxy.conf @@ -1,5 +1,5 @@ PROJECT_NAME = Nagios -PROJECT_NUMBER = 4.1.0rc3 +PROJECT_NUMBER = 4.1.0 PROJECT_BRIEF = "Dev docs for Nagios core and neb-module hackers" INPUT = lib/ docs/ diff --git a/html/main.php b/html/main.php index 803090f31..0edb64c68 100644 --- a/html/main.php +++ b/html/main.php @@ -1,7 +1,7 @@ @@ -129,7 +129,7 @@ function setCoreStatusHTML(image, text) {
Nagios® Core™
Version
-
August 11, 2015
+
August 18, 2015
Check for updates
diff --git a/html/side.php b/html/side.php index 78a20cbf1..33401b41f 100644 --- a/html/side.php +++ b/html/side.php @@ -1,7 +1,7 @@ diff --git a/include/common.h b/include/common.h index 4fda73353..c217833fc 100644 --- a/include/common.h +++ b/include/common.h @@ -24,8 +24,8 @@ #include "shared.h" -#define PROGRAM_VERSION "4.1.0rc3" -#define PROGRAM_MODIFICATION_DATE "08-11-2015" +#define PROGRAM_VERSION "4.1.0" +#define PROGRAM_MODIFICATION_DATE "08-18-2015" NAGIOS_BEGIN_DECL diff --git a/nagios.spec b/nagios.spec index c6c78f8a6..270cf2cd4 100644 --- a/nagios.spec +++ b/nagios.spec @@ -21,7 +21,7 @@ Summary: Open Source host, service and network monitoring program Name: nagios -Version: 4.1.0rc3 +Version: 4.1.0 Release: 2%{?dist} License: GPL Group: Applications/System diff --git a/update-version b/update-version index 0391f800a..ef15db2a6 100755 --- a/update-version +++ b/update-version @@ -12,10 +12,10 @@ else fi # Current version number -CURRENTVERSION=4.1.0rc3 +CURRENTVERSION=4.1.0 # Last date -LASTDATE=08-11-2015 +LASTDATE=08-18-2015 if [ "x$1" = "x" ] then