summaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-02-28 15:28:49 +0100
committerSoren Hansen <soren@linux2go.dk>2011-02-28 15:28:49 +0100
commitd488e18a4dd99ddfb77e39f5be4b270e46b2fd42 (patch)
treea3bfc5a8e527013521889fcdddd59693fe83f669 /setup.py
parent8b0e8b155eab313e0caece48eee609d12df5e5d4 (diff)
parent8b3e9ad11c2f5c425701f1eb4abb7b3f577ae1cc (diff)
downloadnova-d488e18a4dd99ddfb77e39f5be4b270e46b2fd42.tar.gz
nova-d488e18a4dd99ddfb77e39f5be4b270e46b2fd42.tar.xz
nova-d488e18a4dd99ddfb77e39f5be4b270e46b2fd42.zip
Merge sync branch.
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 4ab8f386b..3b48990ac 100644
--- a/setup.py
+++ b/setup.py
@@ -98,7 +98,6 @@ DistUtilsExtra.auto.setup(name='nova',
test_suite='nose.collector',
scripts=['bin/nova-ajax-console-proxy',
'bin/nova-api',
- 'bin/nova-combined',
'bin/nova-compute',
'bin/nova-console',
'bin/nova-dhcpbridge',