1. merged trunk rev749

2. rpc.call returns '/' as '\/', so nova.compute.manager.mktmpfile, nova.compute.manager.confirm.tmpfile, nova.scheduler.driver.Scheduler.mounted_on_same_shared_storage are modified followed by this changes.
3. nova.tests.test_virt.py is modified so that other teams modification is easily detected since other team is using nova.db.sqlalchemy.models.ComputeService.

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',