From: <ag...@us...> - 2011-05-31 13:10:14
|
Revision: 1738 http://nagios.svn.sourceforge.net/nagios/?rev=1738&view=rev Author: ageric Date: 2011-05-31 13:10:03 +0000 (Tue, 31 May 2011) Log Message: ----------- Changelog: Remove merge conflict marker grrmbll... Signed-off-by: Andreas Ericsson <ae...@op...> Modified Paths: -------------- nagioscore/trunk/Changelog Modified: nagioscore/trunk/Changelog =================================================================== --- nagioscore/trunk/Changelog 2011-05-30 14:51:59 UTC (rev 1737) +++ nagioscore/trunk/Changelog 2011-05-31 13:10:03 UTC (rev 1738) @@ -23,7 +23,6 @@ * Fixed bug with passive host checks being incorrectly sent to event brokers as active checks * Fixed bug where passive host check status updates were not being propagated to event brokers * Reverted 'Fix for retaining host display name and alias, as well as service display name' as configuration information stored incorrectly over a reload -<<<<<<< HEAD * Fixed compile warnings for size_t (Michael Friedrich) * Fixed problem where acknowledgements were getting reset when a hard state change occurred * Removed duplicated unlinks for check result files with multiple results This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |