openstack/nova
Code Issues Proposed changes

fix mismerge.

Browse Source
This commit is contained in:
Isaku Yamahata
2011-06-16 02:10:28 +09:00
parent a3b76218e0
commit ab7c45a9be
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/api.py
View File

@@ -553,7 +553,7 @@ class API(base.Base):
instance['id'], instance['id'],
state_description='stopping', state_description='stopping',
state=power_state.NOSTATE, state=power_state.NOSTATE,
terminated_at=datetime.datetime.utcnow()) terminated_at=utils.utcnow())
host = instance['host'] host = instance['host']
if host: if host: