diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-16 11:09:15 -0500 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-16 11:09:15 -0500 |
| commit | 63c5ab9806aeb732dc8a8cb7b902592fb5db9363 (patch) | |
| tree | e2b930eeed60476634a14b33588aba3a179a3d09 /nova/server.py | |
| parent | 47b81061d6282c2b8173e9fc1177098d94b5a1bd (diff) | |
| parent | 3ce6ec1a83731da868c5a77c4684808a54ffd8fd (diff) | |
Merge lp:~anotherjesse/nova/remove-vendor
Diffstat (limited to 'nova/server.py')
| -rw-r--r-- | nova/server.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/server.py b/nova/server.py index 1a6f33876..7a1901a2f 100644 --- a/nova/server.py +++ b/nova/server.py @@ -20,6 +20,8 @@ Base functionality for nova daemons - gradually being replaced with twistd.py. """ +import daemon +from daemon import pidlockfile import logging import logging.handlers import os @@ -27,10 +29,6 @@ import signal import sys import time -from nova import vendor -import daemon -from daemon import pidlockfile - from nova import flags |