diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-02-15 15:01:41 -0500 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-02-15 15:01:41 -0500 |
| commit | 8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e (patch) | |
| tree | a7f13616e6d7cd393b717e7c59766d43b9a07c8c /setup.py | |
| parent | 4a4a3f04b78ba2cbaa0d02ecf0f7cd3cf580901b (diff) | |
| parent | 273e6703a9e4f7e3b7810f204ffb6bb0f86602bd (diff) | |
| download | nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.tar.gz nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.tar.xz nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.zip | |
merging trunk back in; updating Authors conflict
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -85,9 +85,13 @@ setup(name='nova', packages=find_packages(exclude=['bin', 'smoketests']), include_package_data=True, test_suite='nose.collector', - scripts=['bin/nova-api', + scripts=['bin/nova-ajax-console-proxy', + 'bin/nova-api', + 'bin/nova-combined', 'bin/nova-compute', + 'bin/nova-console', 'bin/nova-dhcpbridge', + 'bin/nova-direct-api', 'bin/nova-import-canonical-imagestore', 'bin/nova-instancemonitor', 'bin/nova-logspool', @@ -96,5 +100,6 @@ setup(name='nova', 'bin/nova-objectstore', 'bin/nova-scheduler', 'bin/nova-spoolsentry', + 'bin/stack', 'bin/nova-volume', 'tools/nova-debug']) |