]> xenbits.xensource.com Git - xen.git/commitdiff
projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 301524a f3f86e7)
bitkeeper revision 1.1159.118.2 (4177e027QSr5igdHrB1nC0veTxsuvg)
authormjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
Thu, 21 Oct 2004 16:13:27 +0000 (16:13 +0000)
committermjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
Thu, 21 Oct 2004 16:13:27 +0000 (16:13 +0000)
Merge xenbk@gandalf:/var/bk/xeno-unstable.bk
into wray-m-3.hpl.hp.com:/home/mjw/repos-bk/xeno-unstable.bk

1  2 
tools/python/xen/xend/XendClient.py patch | diff1 | diff2 | blob | history
tools/python/xen/xend/XendDomain.py patch | diff1 | diff2 | blob | history
tools/python/xen/xend/server/SrvDomain.py patch | diff1 | diff2 | blob | history

diff --cc tools/python/xen/xend/XendClient.py
Simple merge
diff --cc tools/python/xen/xend/XendDomain.py
Simple merge
Xen (staging and unstable) mirror