diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-06-16 02:10:28 +0900 |
|---|---|---|
| committer | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-06-16 02:10:28 +0900 |
| commit | ab7c45a9be39def2d6cbb74084abc6fa42f593dd (patch) | |
| tree | 854f2cad7b6fd87c277242c062430436f7402d68 /nova | |
| parent | a3b76218e03567312a84d3b3061d3472034166a4 (diff) | |
| download | nova-ab7c45a9be39def2d6cbb74084abc6fa42f593dd.tar.gz nova-ab7c45a9be39def2d6cbb74084abc6fa42f593dd.tar.xz nova-ab7c45a9be39def2d6cbb74084abc6fa42f593dd.zip | |
fix mismerge.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/compute/api.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 6f7192ae7..18363ace0 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: |