Module: check_mk Branch: master Commit: 03fee488b810f18857dd34a761374c977458fed2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03fee488b810f1… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Oct 31 11:15:45 2013 +0100 Prep for 1.2.3i6 release --- ChangeLog | 4 ++-- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 146763 -> 146758 bytes agents/windows/installer.nsi | 2 +- agents/windows/nowin.exe | Bin 22511 -> 22511 bytes debian/files | 2 +- doc/treasures/mknotifyd | 2 +- livestatus/configure.ac | 2 +- mkeventd/bin/mkeventd | 2 +- scripts/setup.sh | 2 +- werk | 2 +- 23 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 874ad66..ae1de5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,10 @@ 1.2.3i6: Core & Setup: - * FIX 0041: setup.py now handles non existing wwwuser gracefully... + * 0041 FIX: setup.py now handles non existing wwwuser gracefully... Checks & Agents: * 0040: Add agent plugin to test local hostname resolving... - * FIX 0020: Inventory problem with inventory_processes parameter... + * 0020 FIX: Inventory problem with inventory_processes parameter... Multisite: * 0000: Improved performance of LDAP sync by refactoring the group sync code diff --git a/Makefile b/Makefile index f6d149c..588a9af 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.3i5 +VERSION = 1.2.3i6 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 82d8a19..fb0f3ca 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -48,7 +48,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 009e60c..a588707 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index e94f092..c5a75a0 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -48,7 +48,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index ac4d0ee..df160a5 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -89,7 +89,7 @@ function run_cached () { } echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 1148988..2015d66 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -43,7 +43,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index ed00be4..92bbec5 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 2cafe02..53cfc07 100644 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index e9b761a..c7e8a59 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -162,7 +162,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.2.3i5" +$say "Version: 1.2.3i6" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index f5f6dcb..58cd083 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -49,7 +49,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i5 +echo Version: 1.2.3i6 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index f8e8a95..6abcba4 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -75,7 +75,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.3i5" +#define CHECK_MK_VERSION "1.2.3i6" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 09510ef..8a97e00 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index c57be26..00a9d41 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 91e04a1..5be21bf 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 84f2c0b..a60fa29 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.3i5" +!define CHECK_MK_VERSION "1.2.3i6" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 57cbc09..0b87628 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/debian/files b/debian/files index b48ddee..ce39270 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.3i5-1_all.deb net optional +check-mk_1.2.3i6-1_all.deb net optional diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 369010e..014e10c 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -30,7 +30,7 @@ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.3i5" +VERSION="1.2.3i6" # .--Helper functions----------------------------------------------------. # | _ _ _ | # | | | | | ___| |_ __ ___ _ __ ___ | diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 3a33de7..1f2adb3 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.2.3i5], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.3i6], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 3797d9c..15b424b 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.3i5" +VERSION="1.2.3i6" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/scripts/setup.sh b/scripts/setup.sh index ae5f238..023393b 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.3i5 +VERSION=1.2.3i6 NAME=check_mk LANG= LC_ALL= diff --git a/werk b/werk index 304bc1f..546d48c 100755 --- a/werk +++ b/werk @@ -159,7 +159,7 @@ def write_changelog_line(chn, werk): omit = "..." else: omit = "" - chn.write(" * %s%04d: %s%s\n" % (prefix, werk["id"], werk["title"], omit)) + chn.write(" * %04d %s: %s%s\n" % (werk["id"], prefix, werk["title"], omit)) if werk["class"].startswith("incomp"): chn.write(" NOTE: Please refer to the migration notes!\n")