summaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorNaveed Massjouni <naveedm9@gmail.com>2011-08-02 20:11:44 -0400
committerNaveed Massjouni <naveedm9@gmail.com>2011-08-02 20:11:44 -0400
commit60e486ad24ae8a80fea4e2a917a7366ef10740bd (patch)
tree41eef174f29d3bd813d25fb543056bc07e55ca88 /setup.py
parent695afaffaa4de359b306280c252f8f40a3bab5a7 (diff)
parente2770a4558c95aa4b6e276ebe18dc580a82e6d67 (diff)
downloadnova-60e486ad24ae8a80fea4e2a917a7366ef10740bd.tar.gz
nova-60e486ad24ae8a80fea4e2a917a7366ef10740bd.tar.xz
nova-60e486ad24ae8a80fea4e2a917a7366ef10740bd.zip
Merge from 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 c165f40d7..8121e250b 100644
--- a/setup.py
+++ b/setup.py
@@ -124,7 +124,6 @@ setup(name='nova',
'bin/nova-dhcpbridge',
'bin/nova-direct-api',
'bin/nova-import-canonical-imagestore',
- 'bin/nova-instancemonitor',
'bin/nova-logspool',
'bin/nova-manage',
'bin/nova-network',