Module: check_mk
Branch: master
Commit: 75f9586d18910ce7c015c11c44a97590bd43057f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75f9586d18910c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Nov 28 16:13:58 2013 +0100
Fixed conflicts in ChangeLog
---
ChangeLog | 97 -------------------------------------------------------------
1 file changed, 97 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d6e929e..b939f1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -99,103 +99,6 @@
* 0233 FIX: Fixed missing entries in log file and availability view...
-<<<<<<< HEAD
- * 0236 windows_agent: each script can now be configured to run sync / async...
-=======
- * 0072 cmciii_pu_access cmciii_pu_canbus cmciii_pu_io cmciii_pu_temp: New checks for
the Rittal CMC-III PU Unit
- * 0100 juniper_cpu: New check for CPU utilization on Juniper switches
->>>>>>> 24701069454e2677c48a43158a0f615e9b8824fb
- * 0024 FIX: cisco_wlc: removed check configuration parameter ap_model...
- * 0003 FIX: ps: Remove exceeding [ and ] in service description when using process
inventory...
- * 0037 FIX: checkman browser (cmk -m) was not working properly in network subtree...
- * 0283 FIX: Interface Checks: ignore invalid error counts while interface is down...
- * 0081 FIX: Fixed corruption in SNMP walks created with cmk --snmpwalk...
-
- Multisite:
- * 0001 New filters for selecting several host/service-groups at once...
- * 0050 New concept of favorite hosts and services plus matching filters and views...
- * 0211 GUI Notify: Added notify method "popup" to really create popup
windows...
- * 0215 Added option to make HTML escape in plugin outputs configurable...
- * 0071 livedump: new option to include contact_groups instead of contacts when
dumping configuration
- * 0043 FIX: LDAP: Improved error reporting during synchronisation...
- * 0044 FIX: LDAP: Fixed error with empty groups during non nested group sync...
- * 0045 FIX: LDAP: Fixed error when synchronizing non nested groups to roles...
- * 0046 FIX: Fixed editing contactgroup assignments of hosts or folders with
"-" in names...
- * 0049 FIX: Fixed useless I/O during page processing...
- * 0203 FIX: Changed sidebar reload interval to be more random...
- * 0204 FIX: Reduced I/O on logins with access time recording or failed login
counts...
- * 0206 FIX: Fixed logwatch permission check when using liveproxy for normal users...
- * 0210 FIX: LDAP: Fixed problem syncing contactgroups of a user with umlauts in CN
- * 0035 FIX: http[s] links are display again in the plugin output...
- * 0006 FIX: Checkboxes for hosts/services were missing on modified views...
- * 0284 FIX: Context help toggled on/off randomly...
- * 0285 FIX: Fixed bookmarking of absolute URLs or PNP/NagVis URLs in sidebar
snapin...
-
- WATO:
- * 0053 New rule for configuring the display_name of a service...
- * 0216 Supporting float values as SNMP timeout value now...
- * 0082 Improved online help for LDAP connections...
- * 0048 FIX: Tests on host diagnose page are executed parallel now...
- * 0033 FIX: Fixed problem when saving settings in WATOs host diagnostic page...
- * 0205 FIX: NagVis related permissions of roles can be edited again...
- * 0207 FIX: Explicit communities were not saved in all cases...
- * 0094 FIX: Hide SNMPv3 credentials in WATO...
- * 0212 FIX: Fixed broken site edit page in case a TCP socket has been configured...
- * 0095 FIX: Fixed problem with portnumber in Wato Distributed Monitoring dialog
- * 0213 FIX: LDAP: Various small improvements for handling the LDAP user connector...
- * 0039 FIX: Fixed exception on displaying WATO helptexts in the global settings...
- * 0219 FIX: Fixed display problems in WATO folders with long contact group names
- * 0220 FIX: Added HTML escaping to several global settings attributes...
- * 0234 FIX: Improved handling of interface inventory states / types...
-
- Notifications:
- * 0005 Added notification script for sending SMS via
mobilant.com...
- * 0032 FIX: Fixed problem when forwarding notification mails in windows...
- * 0218 FIX: Fixed rendering of HTML mails for Outlook (at least 2013)...
-
- Reporting & Availability:
- * 0051 Option for showing timeline directly in availability table...
- * 0052 Visual colorization of availability according to levels...
- * 0054 New labelling options for availability table...
- * 0055 Allow grouping by host, host group or service group...
- * 0056 New concept of service periods in availability reporting...
- * 0002 You can now annotate events in the availability reporting...
-
- Event Console:
- * 0026 FIX: snmptd_mkevent.py: fixed crash on startup
- * 0036 FIX: Fixed bug where multsite commands did not work properly...
-
- Livestatus:
- * 0067 livedump: new option to mark the mode at the beginning of the dump and
documentation fixes...
- * 0023 FIX: Fixed incorrect starttime of table statehist entries...
- * 0034 FIX: Availability no longer showes incorrect entries when only one logfile
exists...
- * 0233 FIX: Fixed missing entries in log file and availability view...
-
-
-<<<<<<< HEAD
-<<<<<<< HEAD
- * 0026 FIX: snmptd_mkevent.py: fixed crash on startup
- * 0036 FIX: fixed bug in multisite command execution...
-
- Livestatus:
- * 0067 livedump: new option to mark the mode at the beginning of the dump and
documentation fixes...
- * 0023 FIX: table statehist: code cleanup / minor performance improvements
- * 0034 FIX: table statehist: no more missing entries if only one logfile exists
- * 0233 FIX: Fixed missing entries in log file and availability view...
-=======
- * 0026 FIX: snmpd_mkevent.py: fixed crash on startup
- * 0036 FIX: Fixed bug where multsite commands did not work properly...
-
- Livestatus:
- * 0067 livedump: new option to mark the mode at the beginning of the dump and
documentation fixes...
- * 0023 FIX: Fixed incorrect starttime of table statehist entries...
- * 0034 FIX: Availability no longer showes incorrect entries when only one logfile
exists...
- * 0233 FIX: Fixed missing entries in log file or availability view...
->>>>>>> 76d0c2c483e7807fec360708fb2ad5b03479dead
-
-
-=======
->>>>>>> 24701069454e2677c48a43158a0f615e9b8824fb
1.2.3i6:
Core & Setup:
* 0041 FIX: setup.py now handles non existing wwwuser gracefully...