[checkmk-commits] Check_MK Git: check_mk: Fix exception about fallback_agent_output_encoding when using Nagios core

Module: check_mk Branch: master Commit: df3242eefac47e96241f9796daad3741f9ab3903 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df3242eefac47e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 1 16:55:39 2015 +0200 Fix exception about fallback_agent_output_encoding when using Nagios core --- modules/check_mk.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index b5160d3..f3ab241 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2928,9 +2928,8 @@ no_discovery_possible = None 'check_result_path', 'check_submission', 'monitoring_core', 'var_dir', 'counters_directory', 'tcp_cache_dir', 'tmp_dir', 'log_dir', 'snmpwalks_dir', 'check_mk_basedir', 'nagios_user', 'rrd_path', 'rrdcached_socket', - 'omd_root', - 'www_group', 'cluster_max_cachefile_age', 'check_max_cachefile_age', - 'piggyback_max_cachefile_age', + 'omd_root', 'www_group', 'cluster_max_cachefile_age', 'check_max_cachefile_age', + 'piggyback_max_cachefile_age', 'fallback_agent_output_encoding', 'simulation_mode', 'agent_simulator', 'aggregate_check_mk', 'check_mk_perfdata_with_times', 'livestatus_unix_socket', 'use_inline_snmp', 'record_inline_snmp_stats',