[icinga-checkins] icinga.org: icinga-core/rdarrud/cgis: merge confflicts

git at icinga.org git at icinga.org
Thu Sep 16 21:46:42 CEST 2010


Module: icinga-core
Branch: rdarrud/cgis
Commit: bd6b59f7396a593fa597863f8cdbae4baf4a99f5
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=bd6b59f7396a593fa597863f8cdbae4baf4a99f5

Author: Christoph Maser <cmr at financial.com>
Date:   Fri Jul 30 22:46:19 2010 +0200

merge confflicts

---

 base/checks.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/base/checks.c b/base/checks.c
index df37f43..1dcff71 100644
--- a/base/checks.c
+++ b/base/checks.c
@@ -1154,7 +1154,7 @@ int handle_async_service_check_result(service *temp_service, check_result *queue
 		}
 		logit(NSLOG_RUNTIME_WARNING,TRUE,"%s",temp_service->plugin_output);
 
-		temp_service->current_state=STATE_CRITICAL; 
+		temp_service->current_state=STATE_CRITICAL;
 	}
 
 	/* else the return code is okay... */





More information about the icinga-checkins mailing list