diff options
| author | Jesse Andrews <jesse@gigantor.local> | 2010-07-15 11:07:40 -0500 |
|---|---|---|
| committer | Jesse Andrews <jesse@gigantor.local> | 2010-07-15 11:07:40 -0500 |
| commit | c8fdce011092f23efd55385b45db8e6f3886beb1 (patch) | |
| tree | 7f83ed5191fe1b4127232ee3bcd2ea39405e9315 /bin | |
| parent | 122fe2b75f635df0aa3858d05ed6775b76a9776e (diff) | |
| download | nova-c8fdce011092f23efd55385b45db8e6f3886beb1.tar.gz nova-c8fdce011092f23efd55385b45db8e6f3886beb1.tar.xz nova-c8fdce011092f23efd55385b45db8e6f3886beb1.zip | |
remove import of vendor since we have PPA now
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-api | 2 | ||||
| -rwxr-xr-x | bin/nova-compute | 2 | ||||
| -rwxr-xr-x | bin/nova-instancemonitor | 2 | ||||
| -rwxr-xr-x | bin/nova-objectstore | 2 | ||||
| -rwxr-xr-x | bin/nova-rsapi | 2 | ||||
| -rwxr-xr-x | bin/nova-volume | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/bin/nova-api b/bin/nova-api index 7bc9166b8..ae274abf6 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -23,7 +23,7 @@ Tornado daemon for the main API endpoint. import logging -from nova import vendor + from tornado import httpserver from tornado import ioloop diff --git a/bin/nova-compute b/bin/nova-compute index 803887039..5635efbaf 100755 --- a/bin/nova-compute +++ b/bin/nova-compute @@ -33,7 +33,7 @@ NOVA_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'nova') if os.path.exists(NOVA_PATH): sys.path.insert(0, os.path.dirname(NOVA_PATH)) -from nova import vendor + from carrot import connection from carrot import messaging from twisted.internet import task diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor index d3f0ae221..d2ed82c9f 100755 --- a/bin/nova-instancemonitor +++ b/bin/nova-instancemonitor @@ -23,7 +23,7 @@ import logging -from nova import vendor + from twisted.internet import task from twisted.application import service diff --git a/bin/nova-objectstore b/bin/nova-objectstore index 7876864c0..8ae80707e 100755 --- a/bin/nova-objectstore +++ b/bin/nova-objectstore @@ -23,7 +23,7 @@ import logging -from nova import vendor + from tornado import httpserver from tornado import ioloop diff --git a/bin/nova-rsapi b/bin/nova-rsapi index c2f2c9d70..cca5b3048 100755 --- a/bin/nova-rsapi +++ b/bin/nova-rsapi @@ -23,7 +23,7 @@ import logging from wsgiref import simple_server -from nova import vendor + from tornado import ioloop from nova import flags diff --git a/bin/nova-volume b/bin/nova-volume index 9b7787c96..8296eb1d8 100755 --- a/bin/nova-volume +++ b/bin/nova-volume @@ -23,7 +23,7 @@ import logging -from nova import vendor + from tornado import ioloop from nova import flags |
