diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-03-21 13:44:53 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-03-21 13:44:53 -0400 |
| commit | 53bc1a077746d5a72addf0f25fa8f25c8dce1990 (patch) | |
| tree | 0fb1155e6a43317178ab86557c8be8943c94b39b /nova/compute | |
| parent | 58f66ff1d20286b4e321f90f60b3abef2d9ba8c6 (diff) | |
| parent | cf84d5bc465823f9342a0a300176a3cf96fbb925 (diff) | |
merging trunk r837
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. |