From ab7c45a9be39def2d6cbb74084abc6fa42f593dd Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Thu, 16 Jun 2011 02:10:28 +0900
Subject: [PATCH] fix mismerge.

---
 nova/compute/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 6f7192ae7036..18363ace07a0 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -553,7 +553,7 @@ class API(base.Base):
                     instance['id'],
                     state_description='stopping',
                     state=power_state.NOSTATE,
-                    terminated_at=datetime.datetime.utcnow())
+                    terminated_at=utils.utcnow())
 
         host = instance['host']
         if host: