From 115fa2319d6ff7dd4494ecc81829fa04d13d5bcd Mon Sep 17 00:00:00 2001
From: Todd Willey <todd@rubidine.com>
Date: Wed, 14 Jul 2010 19:33:12 -0400
Subject: Remove debug statement.

---
 nova/compute/node.py | 5 -----
 1 file changed, 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)
 
-- 
cgit