[checkmk-commits] Check_MK Git: check_mk: Better description for (cached data)

Module: check_mk Branch: master Commit: 2201ce45b8ad5a1fa58a3ee2d15e19b2b3321be4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2201ce45b8ad5a… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Jan 24 10:35:36 2014 +0100 Better description for (cached data) --- ChangeLog | 9 +++------ web/htdocs/wato.py | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b0260b..bde65fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,16 +62,13 @@ * 0462 emcvnx_raidgroups.list_disks: New check for EMC VNX storage system... * 0463 emcvnx_raidgroups.capacity, emcvnx_raidgroups.capacity_contiguous: New Checks for EMC VNX Storage systems... * 0570 fileinfo.groups: file groups now allow exclude patterns as well -<<<<<<< HEAD - * 0571 cmciii_lcp_fans: now monitors the lower limit for the rpm - * 0572 cmciii_lcp_waterflow: lower and upper limits to the flow are now monitored - * 0573 cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: checks now observe limits to the temperatures -======= * 0464 stulz_pump: new check for the status of pumps of Stulz clima units * 0125 unitrends_backup:Unitrends Backup... * 0126 mikrotik_signal: Check for mikrotik wifi bridges * 0127 hp_proliant_raid: Check for proliant RAID status. ->>>>>>> d95f1c667c93038de25f1677c693ad80fd9b937c + * 0571 cmciii_lcp_fans: now monitors the lower limit for the rpm + * 0572 cmciii_lcp_waterflow: lower and upper limits to the flow are now monitored + * 0573 cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: checks now observe limits to the temperatures * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d68ff37..dc5b503 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2427,7 +2427,7 @@ def mode_inventory(phase, firsttime): if html.var("_scan"): title += _(" (live scan)") else: - title += _(" (cached data)") + title += _(" (might be cached data)") return title elif phase == "buttons":