diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-07-21 14:33:27 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-07-21 14:33:27 -0400 |
| commit | 0dbd2a0ec71de2f9d8d631ae5241a948fc6a51ee (patch) | |
| tree | 658d3a3d0e2675a1738d65cc1260f2594877c360 /cloudinit/mergers | |
| parent | f9d18e2ed747a6d44e60547fbcc0bbff780f351f (diff) | |
| parent | 6a4976e8a9915680fbc91f90bed8fcfa79cba5cf (diff) | |
| download | vyos-cloud-init-0dbd2a0ec71de2f9d8d631ae5241a948fc6a51ee.tar.gz vyos-cloud-init-0dbd2a0ec71de2f9d8d631ae5241a948fc6a51ee.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/mergers')
| -rw-r--r-- | cloudinit/mergers/__init__.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/cloudinit/mergers/__init__.py b/cloudinit/mergers/__init__.py index 0978b2c6..650b42a9 100644 --- a/cloudinit/mergers/__init__.py +++ b/cloudinit/mergers/__init__.py @@ -55,9 +55,6 @@ class UnknownMerger(object): if not meth: meth = self._handle_unknown args.insert(0, method_name) - LOG.debug("Merging '%s' into '%s' using method '%s' of '%s'", - type_name, type_utils.obj_name(merge_with), - meth.__name__, self) return meth(*args) @@ -84,8 +81,6 @@ class LookupMerger(UnknownMerger): # First one that has that method/attr gets to be # the one that will be called meth = getattr(merger, meth_wanted) - LOG.debug(("Merging using located merger '%s'" - " since it had method '%s'"), merger, meth_wanted) break if not meth: return UnknownMerger._handle_unknown(self, meth_wanted, |