diff options
| author | Dave Walker (Daviey) <DaveWalker@ubuntu.com> | 2011-08-06 19:08:08 +0100 |
|---|---|---|
| committer | Dave Walker (Daviey) <DaveWalker@ubuntu.com> | 2011-08-06 19:08:08 +0100 |
| commit | 43548ac4b2bf93dd6e6b1d0cbbc340ae005b4dbf (patch) | |
| tree | 5dcf02ebbc9b93b4ea923a0c2364d3000c122aa5 /setup.py | |
| parent | 2e3b199005d16ee3e35cd6c71b8512628e3631bc (diff) | |
| parent | c5cff2f02e887e518744f42f5a21605398a301a4 (diff) | |
| download | nova-43548ac4b2bf93dd6e6b1d0cbbc340ae005b4dbf.tar.gz nova-43548ac4b2bf93dd6e6b1d0cbbc340ae005b4dbf.tar.xz nova-43548ac4b2bf93dd6e6b1d0cbbc340ae005b4dbf.zip | |
Merge with trunk, resolving merge conflict
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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', |