diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-03-21 10:19:58 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-03-21 10:19:58 -0700 |
| commit | aa8cf7e06e11eb31b7a3c3dbb213350a49307ebe (patch) | |
| tree | ffd8617b1ca0ce73c28ec076501253bf1f626eff /nova/compute | |
| parent | 101c2d910ccae0c8df99625c1c2d54134f8c6971 (diff) | |
| parent | 6980263b8c31c8c8fc83e236b20950201c206e8c (diff) | |
zones3 and trunk merge
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 a31df0895..eae1fee68 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -221,7 +221,7 @@ class ComputeManager(manager.SchedulerDependentManager): 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, @@ -693,7 +693,7 @@ class ComputeManager(manager.SchedulerDependentManager): 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. |