 Home |
Products |
Support |
Community |
News |
xen-changelog
[Xen-changelog] Fix conflicting merge.
| To: | xen-changelog@xxxxxxxxxxxxxxxxxxx |
|---|---|
| Subject: | [Xen-changelog] Fix conflicting merge. |
| From: | Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx> |
| Date: | Fri, 07 Oct 2005 09:02:11 +0000 |
| Delivery-date: | Fri, 07 Oct 2005 08:59:45 +0000 |
| Envelope-to: | www-data@xxxxxxxxxxxxxxxxxxx |
| List-help: | <mailto:xen-changelog-request@lists.xensource.com?subject=help> |
| List-id: | BK change log <xen-changelog.lists.xensource.com> |
| List-post: | <mailto:xen-changelog@lists.xensource.com> |
| List-subscribe: | <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe> |
| List-unsubscribe: | <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe> |
| Reply-to: | xen-devel@xxxxxxxxxxxxxxxxxxx |
| Sender: | xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx |
# HG changeset patch
# User emellor@ewan
# Node ID 48df3efaf61c2cf98dc87ab1b70bd505f0096a6a
# Parent 62190db8932678b3610fb17a770e6a02dedfdb3a
Fix conflicting merge.
Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
diff -r 62190db89326 -r 48df3efaf61c tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py Thu Oct 6 18:43:11 2005
+++ b/tools/python/xen/xend/XendCheckpoint.py Thu Oct 6 23:21:00 2005
@@ -142,7 +142,7 @@
log.debug("IntroduceDomain %d %d %d %s",
dominfo.getDomid(),
store_mfn,
- dominfo.store_channel.port1,
+ dominfo.store_channel,
dominfo.getDomainPath())
IntroduceDomain(dominfo.getDomid(),
store_mfn,
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [Xen-changelog] Merged., Xen patchbot -unstable |
|---|---|
| Next by Date: | [Xen-changelog] Big simplification of the Xen event-channel interface., Xen patchbot -unstable |
| Previous by Thread: | [Xen-changelog] Remove xm commands block-refresh and vbd-refresh, as these are unsupported., Xen patchbot -unstable |
| Next by Thread: | [Xen-changelog] Big simplification of the Xen event-channel interface., Xen patchbot -unstable |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
