diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-18 23:20:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-18 23:20:04 +0000 |
| commit | 58bed5a7a07cdc1b302a96c7fa2be13056fa2333 (patch) | |
| tree | ee30b7ecc72f84a60fc138e920232af810136027 /nova/utils.py | |
| parent | 9e342447c5a7d52cc498561b4636abadd8c997ca (diff) | |
| parent | a1c28495aa8d970df0c1afa4efac1d10bdb24825 (diff) | |
| download | nova-58bed5a7a07cdc1b302a96c7fa2be13056fa2333.tar.gz nova-58bed5a7a07cdc1b302a96c7fa2be13056fa2333.tar.xz nova-58bed5a7a07cdc1b302a96c7fa2be13056fa2333.zip | |
Merge "various cleanups"
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/utils.py b/nova/utils.py index a23feea73..ef2b329ba 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -982,7 +982,7 @@ def cleanup_file_locks(): # reliably tell which sentinels refer to which lock in the # lockfile implementation. - if FLAGS.disable_process_locking: + if FLAGS.disable_process_locking: return hostname = socket.gethostname() @@ -1308,7 +1308,7 @@ def save_and_reraise_exception(): In some cases the exception context can be cleared, resulting in None being attempted to be reraised after an exception handler is run. This can happen when eventlet switches greenthreads or when running an - exception handler, code raises and catches and exception. In both + exception handler, code raises and catches an exception. In both cases the exception context will be cleared. To work around this, we save the exception state, run handler code, and |