Prep for release 4.1.0

NagiosEnterprises · Aug 18, 2015 · 5682db0 · 5682db0
1 parent 2379829
commit 5682db0
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 <?php
 include_once(dirname(__FILE__).'/includes/utils.inc.php');
 
-$this_version = '4.1.0rc3';
+$this_version = '4.1.0';
 $this_year = '2015';
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -129,7 +129,7 @@ function setCoreStatusHTML(image, text) {
 <div id="currentversioninfo">
 	<div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>
 	<div class="version">Version <?php echo $this_version; ?></div>
-	<div class="releasedate">August 11, 2015</div>
+	<div class="releasedate">August 18, 2015</div>
 	<div class="checkforupdates"><a href="https://www.nagios.org/checkforupdates/?version=<?php echo $this_version; ?>&amp;product=nagioscore" target="_blank">Check for updates</a></div>
 </div>
 

diff --git a/html/side.php b/html/side.php
@@ -1,7 +1,7 @@
 <?php
 include_once(dirname(__FILE__).'/includes/utils.inc.php');
 
-$this_version = '4.1.0rc3';
+$this_version = '4.1.0';
 $link_target = 'main';
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

diff --git 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
@@ -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
@@ -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