diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-03-21 07:54:06 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-03-21 07:54:06 -0700 |
| commit | 6980263b8c31c8c8fc83e236b20950201c206e8c (patch) | |
| tree | f45758b4f4bffbcef851d8cb6e3516e481ef9de8 /nova/service.py | |
| parent | 8f0b60f598c28b2f558f3ecdaa2f9604926393e6 (diff) | |
| parent | cf84d5bc465823f9342a0a300176a3cf96fbb925 (diff) | |
| download | nova-6980263b8c31c8c8fc83e236b20950201c206e8c.tar.gz nova-6980263b8c31c8c8fc83e236b20950201c206e8c.tar.xz nova-6980263b8c31c8c8fc83e236b20950201c206e8c.zip | |
trunk merge
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 b021c1cee..47c0b96c0 100644 --- a/nova/service.py +++ b/nova/service.py @@ -223,7 +223,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")) |