Merge pull request #115 from hubblestack/develop

Merge to master (prep for v2017.9.0 round two)

Author: basepi

_beacons/pulsar.py

@@ -417,7 +417,7 @@ def _dict_update(dest, upd, recursive_update=True, merge_lists=False):
                 dest_subkey = None
             if isinstance(dest_subkey, collections.Mapping) \
                     and isinstance(val, collections.Mapping):
-                ret = update(dest_subkey, val, merge_lists=merge_lists)
+                ret = _dict_update(dest_subkey, val, merge_lists=merge_lists)
                 dest[key] = ret
             elif isinstance(dest_subkey, list) \
                      and isinstance(val, list):

_modules/nova_loader.py

@@ -1911,6 +1911,7 @@ def _load_module(self, name):
                     data = yaml.safe_load(fh_)
             except Exception as exc:
                 self.__missing_data__[name] = str(exc)
+                log.exception('Error loading yaml {0}'.format(fh_))
                 return False
 
             self.__data__[name] = data

_modules/win_pulsar.py

@@ -547,7 +547,7 @@ def _dict_update(dest, upd, recursive_update=True, merge_lists=False):
                 dest_subkey = None
             if isinstance(dest_subkey, collections.Mapping) \
                     and isinstance(val, collections.Mapping):
-                ret = update(dest_subkey, val, merge_lists=merge_lists)
+                ret = _dict_update(dest_subkey, val, merge_lists=merge_lists)
                 dest[key] = ret
             elif isinstance(dest_subkey, list) \
                      and isinstance(val, list):