← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to .pc/nova-console-monitor.patch/nova/compute/manager.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-04-04 09:25:14 UTC
  • mfrom: (1.1.52)
  • Revision ID: package-import@ubuntu.com-20120404092514-ry1k7mjzd6plivdk
Tags: 2012.1~rc3-0ubuntu1
* New Upstream release. 
* debian/control: Conflict nova-vncproxy with novnc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/nova-console-monitor.patch/nova/compute/manager.py
2454
2454
        with utils.temporary_mutation(context, read_deleted="yes"):
2455
2455
            for instance in self._running_deleted_instances(context):
2456
2456
                if action == "log":
2457
 
                    LOG.warning(_("Detected instance  with name label "
2458
 
                                  "'%(name_label)s' which is marked as "
 
2457
                    name = instance['name']
 
2458
                    LOG.warning(_("Detected instance with name label "
 
2459
                                  "'%(name)s' which is marked as "
2459
2460
                                  "DELETED but still present on host."),
2460
2461
                                locals(), instance=instance)
2461
2462