summaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorMonsyne Dragon <mdragon@rackspace.com>2011-08-13 00:06:42 +0000
committerMonsyne Dragon <mdragon@rackspace.com>2011-08-13 00:06:42 +0000
commit6a5fa0bd07e305c21c32ea6863614fa9d25566ac (patch)
treeb8dfd89ae929591647077478b4b78d96b2d3fa77 /setup.py
parente7858fabb433a0ee587a9444f749381bf36d5d92 (diff)
parent7aef19a8757dc9558b1c0d83cb1fb08ac976cf5b (diff)
remerge 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 b0e574b20..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',