merge in trunk, resolving conflicts with ttx's branch to switch from using sudo to run_as_root=True

1 files changed, 2 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 8121e250b..9b11fb95a 100644
--- a/setup.py
+++ b/setup.py
@@ -123,7 +123,6 @@ setup(name='nova',
                'bin/nova-console',
                'bin/nova-dhcpbridge',
                'bin/nova-direct-api',
-               'bin/nova-import-canonical-imagestore',
                'bin/nova-logspool',
                'bin/nova-manage',
                'bin/nova-network',
@@ -133,4 +132,5 @@ setup(name='nova',
                'bin/stack',
                'bin/nova-volume',
                'bin/nova-vncproxy',
-               'tools/nova-debug'])
+               'tools/nova-debug'],
+        py_modules=[])