diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-03-21 15:54:19 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-03-21 15:54:19 -0400 |
| commit | 6c10ceb0f6f6d642426a57bc18b858acb5c8f2ee (patch) | |
| tree | fc2cb6c65931681efbc76e320ff5cf6994376a0a /nova/compute | |
| parent | fe1f675dda0aa024a05f6f7a5e8f695932d46ccc (diff) | |
| parent | fb8b0636d02e3663485d4c386a362c7d5ef35041 (diff) | |
Merge w/ trunk.
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 92deca813..c2781f6fb 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -220,7 +220,7 @@ class ComputeManager(manager.Manager): self.db.instance_update(context, instance_id, {'launched_at': now}) - except Exception: # pylint: disable-msg=W0702 + except Exception: # pylint: disable=W0702 LOG.exception(_("instance %s: Failed to spawn"), instance_id, context=context) self.db.instance_set_state(context, @@ -692,7 +692,7 @@ class ComputeManager(manager.Manager): volume_id, instance_id, mountpoint) - except Exception as exc: # pylint: disable-msg=W0702 + except Exception as exc: # pylint: disable=W0702 # NOTE(vish): The inline callback eats the exception info so we # log the traceback here and reraise the same # ecxception below. |