← Back to branch summary

~justin-fathomdb/nova/raw-disk-images

« back to all changes in this revision

Viewing changes to nova/twistd.py

  • Committer: Soren Hansen
  • Date: 2010-07-16 16:09:15 UTC
  • mfrom: (139.2.2 remove-vendor)
  • Revision ID: soren.hansen@rackspace.com-20100716160915-pduf64nx3vjj1uxw
Merge lp:~anotherjesse/nova/remove-vendor

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/twistd.py
22
22
"""
23
23
 
24
24
import logging
 
25
import logging.handlers
25
26
import os
26
27
import signal
27
28
import sys
28
29
import time
29
 
import UserDict
30
 
import logging.handlers
31
 
 
32
 
from nova import vendor
33
30
from twisted.scripts import twistd
34
31
from twisted.python import log
35
32
from twisted.python import reflect
36
33
from twisted.python import runtime
37
34
from twisted.python import usage
 
35
import UserDict
38
36
 
39
37
from nova import flags
40
38
 
 
39
 
41
40
if runtime.platformType == "win32":
42
41
    from twisted.scripts._twistw import ServerOptions
43
42
else: