[Xen-changelog] [xen-unstable] merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 5a21379d087969aee9c573e5cc1571a285fc69ab
# Parent  5aea6a32fc8bfd1e1614e44b05ef349252ac58a0
# Parent  5bf91da9797df82f228b674bcc551ff47c62c8f2
merge
---
 tools/python/xen/xend/server/SrvDomainDir.py |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff -r 5aea6a32fc8b -r 5a21379d0879 
tools/python/xen/xend/server/SrvDomainDir.py
--- a/tools/python/xen/xend/server/SrvDomainDir.py      Thu Dec 07 11:46:07 
2006 +0000
+++ b/tools/python/xen/xend/server/SrvDomainDir.py      Thu Dec 07 11:47:10 
2006 +0000
@@ -165,10 +165,9 @@ class SrvDomainDir(SrvDir):
             req.write('<ul>')
             for d in domains:
                 req.write(
-                    '<li><a href="%s%s">Domain %s</a>: id = %s, memory = %d, '
-                    'ssidref = %d.'
+                    '<li><a href="%s%s">Domain %s</a>: id = %s, memory = %d'
                     % (url, d.getName(), d.getName(), d.getDomid(),
-                       d.getMemoryTarget(), d.getSsidref()))
+                       d.getMemoryTarget()))
                 req.write('</li>')
             req.write('</ul>')
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog