summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-07-19 14:45:39 -0500
committerVishvananda Ishaya <vishvananda@gmail.com>2010-07-19 14:45:39 -0500
commit19a8556917ffebf9f85e68df4a841e1ea97124d2 (patch)
tree3e45898c6f4a58fd17759ad29d8117294d4914ad /nova/compute
parent5d647826d6345bfdd87bad10995319679f39679f (diff)
parentd52925f1f3293a4ad1692bd1aab846c713f7c3de (diff)
merged trunk
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/linux_net.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/linux_net.py b/nova/compute/linux_net.py
index eb9614194..48e07da66 100644
--- a/nova/compute/linux_net.py
+++ b/nova/compute/linux_net.py
@@ -37,13 +37,13 @@ def execute(cmd, addl_env=None):
logging.debug("FAKE NET: %s" % cmd)
return "fake", 0
else:
- return nova.utils.execute(cmd, addl_env=addl_env)
+ return utils.execute(cmd, addl_env=addl_env)
def runthis(desc, cmd):
if FLAGS.fake_network:
return execute(cmd)
else:
- return nova.utils.runthis(desc,cmd)
+ return utils.runthis(desc,cmd)
def Popen(cmd):
if FLAGS.fake_network: