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/service.py | |
| parent | 58f66ff1d20286b4e321f90f60b3abef2d9ba8c6 (diff) | |
| parent | cf84d5bc465823f9342a0a300176a3cf96fbb925 (diff) | |
| download | nova-53bc1a077746d5a72addf0f25fa8f25c8dce1990.tar.gz nova-53bc1a077746d5a72addf0f25fa8f25c8dce1990.tar.xz nova-53bc1a077746d5a72addf0f25fa8f25c8dce1990.zip | |
merging trunk r837
Diffstat (limited to 'nova/service.py')
| -rw-r--r-- | nova/service.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/service.py b/nova/service.py index d60df987c..52bb15ad7 100644 --- a/nova/service.py +++ b/nova/service.py @@ -217,7 +217,7 @@ class Service(object): logging.error(_("Recovered model server connection!")) # TODO(vish): this should probably only catch connection errors - except Exception: # pylint: disable-msg=W0702 + except Exception: # pylint: disable=W0702 if not getattr(self, "model_disconnected", False): self.model_disconnected = True logging.exception(_("model server went away")) |