diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-02-15 17:06:22 -0600 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-02-15 17:06:22 -0600 |
| commit | 9a8c9d78e5fb7ce67fd6afb9c1eebb49b47abfac (patch) | |
| tree | b69119eedb6908525288628122b493b3f082c732 | |
| parent | 92c02908b3e33806e706ba9c59ca35398b645345 (diff) | |
| parent | 56df9b129526aad29ac1a751153d94cfe7656993 (diff) | |
| download | nova-9a8c9d78e5fb7ce67fd6afb9c1eebb49b47abfac.tar.gz nova-9a8c9d78e5fb7ce67fd6afb9c1eebb49b47abfac.tar.xz nova-9a8c9d78e5fb7ce67fd6afb9c1eebb49b47abfac.zip | |
merge with trunk
| -rw-r--r-- | locale/nova.pot | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/locale/nova.pot b/locale/nova.pot index a96411e33..53e38c619 100644 --- a/locale/nova.pot +++ b/locale/nova.pot @@ -1826,7 +1826,7 @@ msgstr "" #: nova/virt/xenapi/vm_utils.py:290 #, python-format -msgid "PV Kernel in VDI:%d" +msgid "PV Kernel in VDI:%s" msgstr "" #: nova/virt/xenapi/vm_utils.py:318 diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 574ef0944..80cc3035d 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -394,7 +394,7 @@ class VMHelper(HelperBase): pv = True elif pv_str.lower() == 'false': pv = False - LOG.debug(_("PV Kernel in VDI:%d"), pv) + LOG.debug(_("PV Kernel in VDI:%s"), pv) return pv @classmethod |