merged trunk

2 files changed, 2 insertions, 2 deletions

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index b353fc44b..931355cbd 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -92,7 +92,7 @@ class LibvirtConnection(object):
 
     def _test_connection(self):
         try:
-            libvirt.getVersion()
+            self._wrapped_conn.getInfo()
             return True
         except libvirt.libvirtError as e:
             if e.get_error_code() == libvirt.VIR_ERR_SYSTEM_ERROR and \
diff --git a/setup.py b/setup.py
index 0fd286f7d..25252e8f4 100644
--- a/setup.py
+++ b/setup.py
@@ -52,5 +52,5 @@ setup(name='nova',
                'bin/nova-manage',
                'bin/nova-network',
                'bin/nova-objectstore',
-               'bin/nova-rsapi',
+               'bin/nova-api-new',
                'bin/nova-volume'])