summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-03-28 13:50:27 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-03-28 13:50:27 -0400
commitf29d17dde27e407dc0b03548f0fee88b6dfbe5c5 (patch)
tree55bce0f5daee06a2a4c945784cf8d7440f3d8a33
parentde07a6409d575af5db748bdbfa2cc57881136d66 (diff)
parentad45419e78deadbcfaca0a182fc038f9d289d4ec (diff)
downloadnova-f29d17dde27e407dc0b03548f0fee88b6dfbe5c5.tar.gz
nova-f29d17dde27e407dc0b03548f0fee88b6dfbe5c5.tar.xz
nova-f29d17dde27e407dc0b03548f0fee88b6dfbe5c5.zip
Merged trunk.
-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())