diff options
| -rw-r--r-- | nova/compute/node.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/nova/compute/node.py b/nova/compute/node.py index 8df620a6b..f045107f8 100644 --- a/nova/compute/node.py +++ b/nova/compute/node.py @@ -541,11 +541,6 @@ class Instance(object): timer.f = _wait_for_boot timer.start(interval=0.5, now=True) except Exception, ex: -<<<<<<< HEAD - # FIXME(todd): this is just for debugging during testing - print "FUUUUUUUUUUUUUUUUUUUUUU: %s" % ex -======= ->>>>>>> master logging.debug(ex) self.set_state(Instance.SHUTDOWN) |