Merge lp:~vishvananda/nova/vnc_console into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Declares the flag for vncproxy_topic in compute.api

Fixes the localization strings in the vnc_console branch so we can merge it. Branch was already approved at https://code.launchpad.net/~sleepsonthefloor/nova/vnc_console/+merge/54805
, but had a couple bad localization strings.

[Jesse Andrews (anotherjesse)]

lgtm

review: Approve

[Vish Ishaya (vishvananda)]

sending this to hudson since it was already approved minus the localization fix.

[OpenStack Infra (hudson-openstack)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Vish Ishaya (vishvananda)]

there was a little bug. reproposing

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[termie (termie)]

move to be next to the flags part instead of having a LOG inbetween?

review: Needs Fixing

[Vish Ishaya (vishvananda)]

fixed spacing and ordering

[lp:~vishvananda/nova/vnc_console]

788. By Vish Ishaya on 2011-03-30

fixed ordering and spacing

[Josh Kearney (jk0)]

lgtm

review: Approve

=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2011-03-30 05:59:13 +0000
+++ nova/compute/api.py	2011-03-30 19:51:01 +0000
@@ -37,8 +37,12 @@
 from nova.scheduler import api as scheduler_api
 from nova.db import base
 
+
+LOG = logging.getLogger('nova.compute.api')
+
+
 FLAGS = flags.FLAGS
-LOG = logging.getLogger('nova.compute.api')
+flags.DECLARE('vncproxy_topic', 'nova.vnc')
 
 
 def generate_default_hostname(instance_id):