{"comment":{"created_at":"2011-10-11T12:31:14Z","body":"### zli/xen-api@26533595f7edf9c8c2f0ff313c0e79d0d0c369cf &#8658; xen-org/xen-api@c3843b4d09ef2847e154432a97fcc7acd72c2aa2: Merge and build failed.\nFailed when executing:\n    git merge 26533595f7edf9c8c2f0ff313c0e79d0d0c369cf\nError log:\n    xen-api: cloning git\n    Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api\n    Cloning into /usr/local/builds/build-xen-git.hg/obj/repos/xen-api...\n    Refreshing cookie to: cecda947bfce7b843887fb29ae15e50a6560f5b5\n    ======> 1318336408 api: xen-api placed into myrepos\n    ======> 1318336408 clone-stunnel.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/stunnel.git.lock\n    stunnel: cloning git\n    Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/stunnel.git to /usr/local/builds/build-xen-git.hg/obj/repos/stunnel\n    Cloning into /usr/local/builds/build-xen-git.hg/obj/repos/stunnel...\n    Refreshing cookie to: 8e88341f2c45fe042468b78dfc7692c9f50ed90d\n    ======> 1318336409 stunnel: stunnel placed into myrepos\n    ======> 1318336409 clone-xen-api-libs.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api-libs.git.lock\n    xen-api-libs: cloning git\n    Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api-libs.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api-libs\n    Cloning into /usr/local/builds/build-xen-git.hg/obj/repos/xen-api-libs...\n    Refreshing cookie to: 674aabed4c6a77645996e4d76b28d1621aa44149\n    ======> 1318336410 api-libs: xen-api-libs placed into myrepos\n    Auto-merging ocaml/xapi/message_forwarding.ml\n    CONFLICT (content): Merge conflict in ocaml/xapi/message_forwarding.ml\n    Automatic merge failed; fix conflicts and then commit the result.","updated_at":"2011-10-11T12:31:14Z","url":"https://api.github.com/repos/xen-org/xen-api/issues/comments/2360802","id":2360802,"user":{"avatar_url":"https://secure.gravatar.com/avatar/1352cf2b13341a62c7e03b8cc83a5fcd?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png","url":"https://api.github.com/users/xen-git","id":655364,"login":"xen-git"}},"action":"created","issue":{"number":230,"created_at":"2011-06-15T16:55:05Z","pull_request":{"diff_url":"https://github.com/xen-org/xen-api/pull/230.diff","patch_url":"https://github.com/xen-org/xen-api/pull/230.patch","html_url":"https://github.com/xen-org/xen-api/pull/230"},"body":"","comments":113,"title":"Optimize host choice in vdi copy","updated_at":"2011-10-11T12:31:14Z","url":"https://api.github.com/repos/xen-org/xen-api/issues/230","id":1062392,"assignee":null,"milestone":null,"closed_at":null,"user":{"avatar_url":"https://secure.gravatar.com/avatar/f20f7bba9abb1e35e3b650dede5d063d?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png","url":"https://api.github.com/users/zli","id":451900,"login":"zli"},"html_url":"https://github.com/xen-org/xen-api/issues/230","labels":[],"state":"open"},"legacy":{"issue_id":1062392,"comment_id":2360802}}