From b10db3bd7fbc0c1fe92670991829f5f418e40485 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 25 Sep 2013 09:21:17 +0200 Subject: [PATCH] config: Rename Service::servicegroups to Service::groups. --- lib/icinga/icinga-type.conf | 5 ++--- lib/icinga/service.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/icinga/icinga-type.conf b/lib/icinga/icinga-type.conf index c819a34c3..37a755577 100644 --- a/lib/icinga/icinga-type.conf +++ b/lib/icinga/icinga-type.conf @@ -86,8 +86,7 @@ type Service { %attribute array "host_dependencies" { %attribute name(Host) "*" }, - %attribute array "service_ - dependencies" { + %attribute array "service_dependencies" { %attribute dictionary "*" { %require "host", %attribute name(Host) "host", @@ -96,7 +95,7 @@ type Service { %attribute string "service" } }, - %attribute array "servicegroups" { + %attribute array "groups" { %attribute name(ServiceGroup) "*" }, diff --git a/lib/icinga/service.h b/lib/icinga/service.h index 65986f68c..2bb1dbfbb 100644 --- a/lib/icinga/service.h +++ b/lib/icinga/service.h @@ -345,7 +345,7 @@ private: Dictionary::Ptr m_Macros; Array::Ptr m_HostDependencies; Array::Ptr m_ServiceDependencies; - Array::Ptr m_ServiceGroups; + Array::Ptr m_Groups; String m_ShortName; Value m_Acknowledgement; Value m_AcknowledgementExpiry;