Module: check_mk Branch: master Commit: 49b009a44fe1cbb3ae77b0e197494a7f549a70aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49b009a44fe1cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 17 15:10:56 2013 -0500 FIX: fixed setting for locking mode from 'ait' to 'wait' --- ChangeLog | 3 ++- web/plugins/wato/check_mk_configuration.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac526a6..fc5b15a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * Dell Open Manage: SNNP Checks for Physical Disks, CPU and Memory * check_tcp: Now able to set custom service description * Apache ActiveMQ: New Special Agent and Check to query ActiveMQ Queues + * check_ftp: can now be configured via Wato * FIX: esx_vsphere_counters: added missing ramdisk type upgradescratch * FIX: esx_vsphere_hostsystem: fixed bug in handling of params * FIX: local: tolerate invalid output lines @@ -58,7 +59,7 @@ * New option for full SNMP scan in bulk inventory * FIX: correct display of number of hosts in bulk inventory * FIX: nailed down ".siteid" exception when added new site - * Check_ftp: can now be configured via Wato + * FIX: fixed setting for locking mode from 'ait' to 'wait' 1.2.3i4: Core: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 886f85a..d1ea01e 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -867,7 +867,7 @@ register_configvar(group, "off locking altogether."), choices = [ ('abort', _("Abort with an error")), - ('ait' , _("Wait until the other has finished") ), + ('wait' , _("Wait until the other has finished") ), (None , _("Disable locking") ), ]), need_restart = False