summaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorKen Pepple <ken.pepple@gmail.com>2011-02-24 11:05:18 -0800
committerKen Pepple <ken.pepple@gmail.com>2011-02-24 11:05:18 -0800
commit0b490e1ade9e8e65e8df6f86bbe47bd3dbe1d44c (patch)
tree73c2638d13d1d2d99447603a2c055dce1ac48a2e /setup.py
parent3696b1d8076426b2d94a232f8b77985d99a3e658 (diff)
parent25f50fba4a79b45edea33aab58c76197c7d764dc (diff)
merge trunk
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',