merged in trunk and fixed import merge errors

9 files changed, 7 insertions, 16 deletions

diff --git a/bin/nova-api b/bin/nova-api
index 7bc9166b8..26f5dbc87 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -22,8 +22,6 @@ 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-dhcpbridge b/bin/nova-dhcpbridge
index cd0eab2a8..d15924e57 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -32,13 +32,13 @@ import sys
 #              not true the ugly line below can be removed
 sys.path.append(os.path.abspath(os.path.join(__file__, "../../")))
 
+from nova import flags
 from nova import rpc
 from nova import utils
-
 from nova.compute import linux_net
 from nova.compute import network
 
-from nova import flags
+
 FLAGS = flags.FLAGS
 
 
diff --git a/bin/nova-import-canonical-imagestore b/bin/nova-import-canonical-imagestore
index 82daf61ce..2e79f09b7 100755
--- a/bin/nova-import-canonical-imagestore
+++ b/bin/nova-import-canonical-imagestore
@@ -29,9 +29,9 @@ import subprocess
 import sys
 import urllib2
 
-from nova.objectstore import image
 from nova import flags
 from nova import utils
+from nova.objectstore import image
 
 FLAGS = flags.FLAGS
 
diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor
index d3f0ae221..b195089b7 100755
--- a/bin/nova-instancemonitor
+++ b/bin/nova-instancemonitor
@@ -22,8 +22,6 @@
 """
 
 import logging
-
-from nova import vendor
 from twisted.internet import task
 from twisted.application import service
 
diff --git a/bin/nova-manage b/bin/nova-manage
index 5693a40f6..56f89ce30 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -23,6 +23,7 @@
 """
 
 import sys
+import time
 
 from nova import flags
 from nova import utils
@@ -31,7 +32,7 @@ from nova.compute import model
 from nova.compute import network
 from nova.cloudpipe import pipelib
 from nova.endpoint import cloud
-import time
+
 
 FLAGS = flags.FLAGS
 
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 7876864c0..521f3d5d1 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -22,8 +22,6 @@
 """
 
 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..5cbe2d8c1 100755
--- a/bin/nova-rsapi
+++ b/bin/nova-rsapi
@@ -21,10 +21,8 @@
 """
 
 import logging
-from wsgiref import simple_server
-
-from nova import vendor
 from tornado import ioloop
+from wsgiref import simple_server
 
 from nova import flags
 from nova import rpc
diff --git a/bin/nova-volume b/bin/nova-volume
index 9b7787c96..df9fb5c7a 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -22,8 +22,6 @@
 """
 
 import logging
-
-from nova import vendor
 from tornado import ioloop
 
 from nova import flags