[icinga-checkins] icinga.org: icingaweb2-module-director/master: Sync: use setProperties

git at icinga.org git at icinga.org
Tue Feb 23 10:14:57 CET 2016


Module: icingaweb2-module-director
Branch: master
Commit: 037b3178a013f71526ea625fd92a5c028d874946
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=037b3178a013f71526ea625fd92a5c028d874946

Author: Thomas Gelf <thomas at gelf.net>
Date:   Tue Feb 23 09:08:14 2016 +0100

Sync: use setProperties

---

 library/Director/Import/Sync.php |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/Director/Import/Sync.php b/library/Director/Import/Sync.php
index abb08ee..6c5d090 100644
--- a/library/Director/Import/Sync.php
+++ b/library/Director/Import/Sync.php
@@ -444,7 +444,9 @@ class Sync
                         break;
 
                     case 'merge':
-                        $objects[$key]->merge($object);
+                        // TODO: re-evaluate merge settings. vars.x instead of
+                        //       just "vars" might suffice.
+                        $objects[$key]->setProperties($object);
                         break;
 
                     default:



More information about the icinga-checkins mailing list