summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorArmando Migliaccio <armando.migliaccio@citrix.com>2011-03-28 22:04:52 +0100
committerArmando Migliaccio <armando.migliaccio@citrix.com>2011-03-28 22:04:52 +0100
commit30ad1f72b2e71fa81b71f88b2abd9a23a1d2ed10 (patch)
tree853545b6aa0e76a2c7139cf927f3703b21ecc298 /bin
parentc1ed5fc3dfeecef281df45cd2e6779fa21c63bf5 (diff)
parent848c8212a4c9c53f0e2a6b4154fb9504b95db060 (diff)
merge trunk
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-ajax-console-proxy2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy
index b4ba157e1..0342c620a 100755
--- a/bin/nova-ajax-console-proxy
+++ b/bin/nova-ajax-console-proxy
@@ -115,7 +115,7 @@ class AjaxConsoleProxy(object):
{'args': data['args'], 'last_activity': time.time()}
conn = rpc.Connection.instance(new=True)
- consumer = rpc.TopicConsumer(
+ consumer = rpc.TopicAdapterConsumer(
connection=conn,
topic=FLAGS.ajax_console_proxy_topic)
consumer.register_callback(Callback())