fix mismerge.

This commit is contained in:
Isaku Yamahata
2011-06-16 02:10:28 +09:00
parent a3b76218e0
commit ab7c45a9be

View File

@@ -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: