summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Willey <todd@rubidine.com>2010-07-14 19:33:12 -0400
committerTodd Willey <todd@rubidine.com>2010-07-14 19:33:12 -0400
commit115fa2319d6ff7dd4494ecc81829fa04d13d5bcd (patch)
tree94717b6cb0c2e3de694896f30c952bc5500dafa8
parentb01f71ae7ba387a5e7ff2c6ad4a4775f9ab6e22b (diff)
downloadnova-115fa2319d6ff7dd4494ecc81829fa04d13d5bcd.tar.gz
nova-115fa2319d6ff7dd4494ecc81829fa04d13d5bcd.tar.xz
nova-115fa2319d6ff7dd4494ecc81829fa04d13d5bcd.zip
Remove debug statement.
-rw-r--r--nova/compute/node.py5
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)