Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CA-85761: distinguish between unguessable uuids and references and those which are merely unique #756

Closed
wants to merge 4 commits into from
Closed

CA-85761: distinguish between unguessable uuids and references and those which are merely unique #756

wants to merge 4 commits into from

Conversation

djs55
Copy link
Contributor

@djs55 djs55 commented Jul 11, 2012

Everywhere where we make a uuid or reference, decide whether it needs to be unguessable or not. The only things which must be unguessable are session ids (and possibly secrets).

With this change the number of /dev/urandom reads recorded by strace during a migration drops from 680 to 10.

Tested by:
1. quicktest
2. xapi restart with no pool secret -- to verify regeneration was ok
3. adding a "SECURE:" prefix to "Uuid.secure" and checking that sessions were "secure" while VM references were not

@xen-git
Copy link
Contributor

xen-git commented Jul 11, 2012

djs55/xen-api@0a73c20 ⇒ 880a717: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 242/341 targets are up to date
*** omake: failed (0.79 sec, 30/30 scans, 14/24 rules, 121/420 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.63770 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.63770 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1

@xen-git
Copy link
Contributor

xen-git commented Jul 12, 2012

djs55/xen-api@0a73c20 ⇒ 2a9f119: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 243/341 targets are up to date
*** omake: failed (0.81 sec, 30/30 scans, 15/25 rules, 124/426 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.98880 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.98880 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1

@xen-git
Copy link
Contributor

xen-git commented Jul 12, 2012

djs55/xen-api@0a73c20 ⇒ 79545c2: Merge and build failed.

Failed when executing:
git merge 0a73c20e22af5b7c7d8715f5499d925950adff42
Error log:
249 files updated, 0 files merged, 0 files removed, 0 files unresolved
======> 1342118516 Build: Regenerating /usr/local/builds/build-xen-git.hg/obj/depends.frag.mk with COMPONENTS_build =
======> 1342118516 Build: Regenerating dependency graph
======> 1342118520 Build: Regenerating /usr/local/builds/build-xen-git.hg/obj/depends.frag.mk with COMPONENTS_build = xen ioemu blktap install-image-base kernel-rhel4x kernel-rhel6-i686 kernel-rhel6-x86_64 kernel-rhel61-i686 kernel-rhel61-x86_64 kernel-dom0 kernel-dom0-pvops kernel-csp kernel-debian-source kernel-debian-etch-amd64 kernel-debian-etch-i386 kernel-generic-source kernel-generic-rpm-i686 kernel-debian-lenny kernel-netback kernel-iscsitarget branding gcc-dom0 uclibc-kbd dom0 ddk dvsc dlvm xsconsole uclibc-toolchain uclibc-xen driverdomain-network driverdomain-iscsitarget pvdrivers-win template-debian-etch template-debian-etch-amd64 xgt-package install-image docs eulas rhel45-guest-installer rhel46-guest-installer rhel47-guest-installer rhel48-guest-installer rhel50-guest-installer rhel51-guest-installer rhel52-guest-installer rhel53-guest-installer rhel54-guest-installer rhel55-guest-installer rhel56-guest-installer rhel57-guest-installer rhel60-guest-installer rhel61-guest-installer rhel62-guest-installer ubuntu-guest-installer linux-guest-loader binary-iso guest-packages-rhel4x guest-packages-rhel6x guest-packages-PyPAM guest-packages-SDL guest-packages-biosdevname guest-packages-cyrus-sasl guest-packages-dbus guest-packages-directfb guest-packages-dm-multipath guest-packages-e2fsprogs guest-packages-elasticsyslog guest-packages-ethtool guest-packages-fbi guest-packages-firmware guest-packages-gdisk guest-packages-hdparm guest-packages-hwdata guest-packages-iproute2 guest-packages-ipset guest-packages-iptables guest-packages-irqbalance guest-packages-kexec guest-packages-libpcap guest-packages-linux-firmware guest-packages-lvm guest-packages-mbootpack guest-packages-mcelog guest-packages-mercurial guest-packages-mkinitrd guest-packages-net-snmp guest-packages-open-iscsi guest-packages-openssl guest-packages-oprofile guest-packages-pam guest-packages-simplejson guest-packages-smartmontools guest-packages-splashy guest-packages-sysfsutils guest-packages-sysklogd guest-packages-tcpdump guest-packages-udhcp guest-packages-vastsky guest-packages-vhostmd guest-packages-vncsnapshot guest-packages-xenserver-lsb guest-packages-dom0 guest-packages-dom0-kernel guest-packages-csp-kernel guest-packages-dbusproxy guest-packages-vcputune guest-packages-pyserial guest-utilities-rpm guest-utilities-deb dom0-dists chroot-dom0 chroot-centos5 chroot-rhel45 chroot-rhel46 chroot-rhel47 chroot-rhel48 chroot-rhel5 chroot-rhel51 chroot-rhel52 chroot-rhel53 chroot-rhel54 chroot-rhel55 chroot-rhel56 chroot-rhel57 chroot-rhel6 chroot-rhel61 chroot-sles100 chroot-sles101 chroot-sles102 chroot-sles103 chroot-sles110 chroot-etch chroot-lenny ocaml api-libs api-utils api v6 api-bindings syslinux tools-iso win-tools-iso vncterm dotnet-packages-ref xenadmin-ref sm sm-closed sources license product xe-phase-1 xe-phase-2 xe-phase-3 kernel-phase-1 gui-phase-1 docs-phase-1 support-phase-1 all-phase sdktest binary-packages poolmon-deb poolmon-rpm vmmon-deb xha bugagg stunnelng likewise storagelink ocaml-libs openpegasus openvswitch transfer transfervm xs-cim xs-hp-esp integration-suite xencenter-ovf oem-phase-1 xenbootserver-template test-hotfix-1 test-hotfix-2 test-hotfix-3 test-hotfix-3b test-hotfix-4 test-hotfix-4b test-hotfix-5 test-gitbuild cloud-supp vpx-conversion vpx-conversion-rpm conversion-ref vpx-dlvm vpx-dlvm-rpm vpx-wlb vpx-wlb-rpm vpx-license-server vpx-license-server-rpm python-libs remote-ops filesystem-summarise stunnel isl_buildenv xs-netscaler auto-cert-kit guest-templates supp-pack-build tboot dev-pack wsproxy
ln -sf /usr/groups/xen/carbon/trunk-ring3/latest/manifest /usr/local/builds/build-xen-git.hg/obj/manifest.input
-rw-r--r-- 1 root root 0 Jul 12 18:41 /usr/local/builds/build-xen-git.hg/obj/.dirstamp
======> 1342118525 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: 73b557d
======> 1342118533 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_guest_agent.ml
Auto-merging ocaml/xapi/dbsync_master.ml
CONFLICT (content): Merge conflict in ocaml/xapi/dbsync_master.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Jul 13, 2012

djs55/xen-api@0a73c20 ⇒ 341dcc5: Merge and build failed.

Failed when executing:
git merge 0a73c20e22af5b7c7d8715f5499d925950adff42
Error log:
======> 1342188487 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_guest_agent.ml
Auto-merging ocaml/xapi/monitor_master.ml
Auto-merging ocaml/xapi/helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/dbsync_master.ml
CONFLICT (content): Merge conflict in ocaml/xapi/dbsync_master.ml
Auto-merging ocaml/xapi/create_misc.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Jul 17, 2012

djs55/xen-api@0a73c20 ⇒ a656e99: Merge and build failed.

Failed when executing:
git merge 0a73c20e22af5b7c7d8715f5499d925950adff42
Error log:
======> 1342539688 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_guest_agent.ml
Auto-merging ocaml/xapi/monitor_master.ml
Auto-merging ocaml/xapi/helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/dbsync_master.ml
CONFLICT (content): Merge conflict in ocaml/xapi/dbsync_master.ml
Auto-merging ocaml/xapi/create_misc.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Jul 17, 2012

djs55/xen-api@0a73c20 ⇒ 9dff6ec: Merge and build failed.

Failed when executing:
git merge 0a73c20e22af5b7c7d8715f5499d925950adff42
Error log:
======> 1342546867 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_guest_agent.ml
Auto-merging ocaml/xapi/monitor_master.ml
Auto-merging ocaml/xapi/helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/dbsync_master.ml
CONFLICT (content): Merge conflict in ocaml/xapi/dbsync_master.ml
Auto-merging ocaml/xapi/create_misc.ml
Automatic merge failed; fix conflicts and then commit the result.

@djs55
Copy link
Contributor Author

djs55 commented Jul 18, 2012

This needs to be merged at the same time as
xapi-project/xen-api-libs#108

@xen-git
Copy link
Contributor

xen-git commented Jul 18, 2012

djs55/xen-api@3a67f03 ⇒ 9dff6ec: Merge and build failed.

Failed when executing:
make api-build
Error log:
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: warning: stdout is not a tty, disabling the progress bar
(use --progress to override).
*** omake: 242/350 targets are up to date
*** omake: failed (1.50 sec, 29/29 scans, 14/16 rules, 125/434 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.92984 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.92984 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1

@xen-git
Copy link
Contributor

xen-git commented Jul 18, 2012

djs55/xen-api@3a67f03 ⇒ aa8a298: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 250/350 targets are up to date
*** omake: failed (0.84 sec, 29/29 scans, 14/24 rules, 124/432 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.45472 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.45472 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1

@xen-git
Copy link
Contributor

xen-git commented Jul 18, 2012

djs55/xen-api@3a67f03 ⇒ 92907f8: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 251/350 targets are up to date
*** omake: failed (0.81 sec, 30/30 scans, 14/24 rules, 124/432 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.41815 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.41815 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1

@xen-git
Copy link
Contributor

xen-git commented Jul 19, 2012

djs55/xen-api@3a67f03 ⇒ 4d86e2d: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 245/350 targets are up to date
*** omake: failed (0.88 sec, 28/28 scans, 14/20 rules, 124/432 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.74413 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.74413 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1

@xen-git
Copy link
Contributor

xen-git commented Jul 23, 2012

djs55/xen-api@3a67f03 ⇒ 4bfc9cd: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 252/353 targets are up to date
*** omake: failed (0.88 sec, 29/29 scans, 15/23 rules, 128/442 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.97165 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.97165 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1

@xen-git
Copy link
Contributor

xen-git commented Jul 24, 2012

djs55/xen-api@3a67f03 ⇒ 4436181: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 251/353 targets are up to date
*** omake: failed (0.79 sec, 29/29 scans, 14/22 rules, 125/436 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.60445 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.60445 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1

@xen-git
Copy link
Contributor

xen-git commented Jul 24, 2012

djs55/xen-api@3a67f03 ⇒ 8e0794a: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 248/353 targets are up to date
*** omake: failed (0.82 sec, 28/28 scans, 14/20 rules, 125/436 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.49365 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.49365 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1

@xen-git
Copy link
Contributor

xen-git commented Jul 24, 2012

djs55/xen-api@3a67f03 ⇒ 1e7055c: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 247/353 targets are up to date
*** omake: failed (0.93 sec, 27/27 scans, 14/20 rules, 125/436 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.21421 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.21421 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1

@xen-git
Copy link
Contributor

xen-git commented Jul 25, 2012

djs55/xen-api@3a67f03 ⇒ 0d15255: Merge and build failed.

Failed when executing:
git merge 3a67f0337539e4c687be8a85ce5d0bfae129b2d9
Error log:
ln -sf /usr/groups/xen/carbon/trunk-ring3/latest/manifest /usr/local/builds/build-xen-git.hg/obj/manifest.input
-rw-r--r-- 1 root root 0 Jul 25 11:48 /usr/local/builds/build-xen-git.hg/obj/.dirstamp
======> 1343216942 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: 1e7055c
======> 1343216950 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vbd.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/monitor_master.ml
CONFLICT (content): Merge conflict in ocaml/xapi/monitor_master.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Jul 26, 2012

djs55/xen-api@3a67f03 ⇒ 3b22ab6: Merge and build failed.

Failed when executing:
git merge 3a67f0337539e4c687be8a85ce5d0bfae129b2d9
Error log:
ln -sf /usr/groups/xen/carbon/trunk-ring3/latest/manifest /usr/local/builds/build-xen-git.hg/obj/manifest.input
-rw-r--r-- 1 root root 0 Jul 26 10:08 /usr/local/builds/build-xen-git.hg/obj/.dirstamp
======> 1343297318 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: 0d15255
======> 1343297327 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vbd.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/monitor_master.ml
CONFLICT (content): Merge conflict in ocaml/xapi/monitor_master.ml
Automatic merge failed; fix conflicts and then commit the result.

David Scott added 2 commits July 26, 2012 12:03
[xapi] add missing .mli file
a0406a3 
Signed-off-by: David Scott <dave.scott@eu.citrix.com>
CA-85761: switch most UUID generation over to fast PRNG, rather than …
842accd 
…/dev/urandom

We only need /dev/{u,}random when the results have to be unguessable.
In the vast majority of cases we only require the UUIDs to be Unique.

When we need an unguessable UUID we use Uuid.secure() and when we need
only a unique UUID we use Uuid.insecure()

In particular, we still need unguessable UUIDs for anything to do with
* session generation
* secrets

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
@djs55
Copy link
Contributor Author

djs55 commented Jul 26, 2012

Rebased following a reindent?

CA-85761: switch most Ref generation over to fast PRNG, rather than /…
eedc738 
…dev/urandom

Just like with UUIDs, the vast majority of the time we only need
Refs to be Unique, not unguessable.

Whenever we want an unguessable ref, we call Ref.secure() and whenever
we only need a unique ref, we call Ref.insecure()

In particular, we still need unguessable UUIDs for anything to do with
* session generation
* secrets

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
@xen-git
Copy link
Contributor

xen-git commented Jul 26, 2012

djs55/xen-api@eedc738 ⇒ 3b22ab6: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 252/353 targets are up to date
*** omake: failed (0.92 sec, 29/29 scans, 15/23 rules, 128/442 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.28877 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.28877 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1

CA-85761: adjust the new unit test suite to use the new Ref/Uuid APIs
9939238 
Signed-off-by: David Scott <dave.scott@eu.citrix.com>
@xen-git
Copy link
Contributor

xen-git commented Jul 26, 2012

djs55/xen-api@9939238 ⇒ 3b22ab6: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 259/353 targets are up to date
*** omake: failed (0.89 sec, 32/32 scans, 14/27 rules, 125/436 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.40595 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.40595 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1

@xen-git
Copy link
Contributor

xen-git commented Jul 31, 2012

djs55/xen-api@9939238 ⇒ d4f184c: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
======> 1343731472 Build: Regenerating /usr/local/builds/build-xen-git.hg/obj/depends.frag.mk with COMPONENTS_build = xen ioemu blktap install-image-base kernel-rhel4x kernel-rhel6-i686 kernel-rhel6-x86_64 kernel-rhel61-i686 kernel-rhel61-x86_64 kernel-dom0 kernel-dom0-pvops kernel-csp kernel-debian-source kernel-debian-etch-amd64 kernel-debian-etch-i386 kernel-generic-source kernel-generic-rpm-i686 kernel-debian-lenny kernel-netback kernel-iscsitarget branding gcc-dom0 uclibc-kbd dom0 ddk dvsc dlvm xsconsole uclibc-toolchain uclibc-xen driverdomain-network driverdomain-iscsitarget pvdrivers-win template-debian-etch template-debian-etch-amd64 xgt-package install-image docs eulas rhel45-guest-installer rhel46-guest-installer rhel47-guest-installer rhel48-guest-installer rhel50-guest-installer rhel51-guest-installer rhel52-guest-installer rhel53-guest-installer rhel54-guest-installer rhel55-guest-installer rhel56-guest-installer rhel57-guest-installer rhel60-guest-installer rhel61-guest-installer rhel62-guest-installer ubuntu-guest-installer linux-guest-loader binary-iso guest-packages-rhel4x guest-packages-rhel6x guest-packages-PyPAM guest-packages-SDL guest-packages-biosdevname guest-packages-cyrus-sasl guest-packages-dbus guest-packages-directfb guest-packages-dm-multipath guest-packages-e2fsprogs guest-packages-elasticsyslog guest-packages-ethtool guest-packages-fbi guest-packages-firmware guest-packages-gdisk guest-packages-hdparm guest-packages-hwdata guest-packages-iproute2 guest-packages-ipset guest-packages-iptables guest-packages-irqbalance guest-packages-kexec guest-packages-libpcap guest-packages-linux-firmware guest-packages-lvm guest-packages-mbootpack guest-packages-mcelog guest-packages-mercurial guest-packages-mkinitrd guest-packages-net-snmp guest-packages-open-iscsi guest-packages-openssl guest-packages-oprofile guest-packages-pam guest-packages-simplejson guest-packages-smartmontools guest-packages-splashy guest-packages-sysfsutils guest-packages-sysklogd guest-packages-tcpdump guest-packages-udhcp guest-packages-vastsky guest-packages-vhostmd guest-packages-vncsnapshot guest-packages-xenserver-lsb guest-packages-dom0 guest-packages-dom0-kernel guest-packages-csp-kernel guest-packages-dbusproxy guest-packages-vcputune guest-packages-pyserial guest-utilities-rpm guest-utilities-deb dom0-dists chroot-dom0 chroot-centos5 chroot-rhel45 chroot-rhel46 chroot-rhel47 chroot-rhel48 chroot-rhel5 chroot-rhel51 chroot-rhel52 chroot-rhel53 chroot-rhel54 chroot-rhel55 chroot-rhel56 chroot-rhel57 chroot-rhel6 chroot-rhel61 chroot-sles100 chroot-sles101 chroot-sles102 chroot-sles103 chroot-sles110 chroot-etch chroot-lenny ocaml api-libs api-utils api v6 api-bindings syslinux tools-iso win-tools-iso vncterm dotnet-packages-ref xenadmin-ref sm sm-closed sources license product xe-phase-1 xe-phase-2 xe-phase-3 kernel-phase-1 gui-phase-1 docs-phase-1 support-phase-1 all-phase sdktest binary-packages poolmon-deb poolmon-rpm vmmon-deb xha bugagg stunnelng likewise storagelink ocaml-libs openpegasus openvswitch transfer transfervm xs-cim xs-hp-esp integration-suite xencenter-ovf oem-phase-1 xenbootserver-template test-hotfix-1 test-hotfix-2 test-hotfix-3 test-hotfix-3b test-hotfix-4 test-hotfix-4b test-hotfix-5 test-gitbuild cloud-supp vpx-conversion vpx-conversion-rpm conversion-ref vpx-dlvm vpx-dlvm-rpm vpx-wlb vpx-wlb-rpm vpx-license-server vpx-license-server-rpm python-libs remote-ops filesystem-summarise stunnel isl_buildenv xs-netscaler auto-cert-kit guest-templates supp-pack-build tboot dev-pack wsproxy
ln -sf /usr/groups/xen/carbon/trunk-ring3/latest/manifest /usr/local/builds/build-xen-git.hg/obj/manifest.input
-rw-r--r-- 1 root root 0 Jul 31 10:44 /usr/local/builds/build-xen-git.hg/obj/.dirstamp
======> 1343731477 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: d4f184c
======> 1343731617 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/database/redo_log.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Jul 31, 2012

djs55/xen-api@9939238 ⇒ 1a684ed: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
======> 1343771315 Build: Regenerating /usr/local/builds/build-xen-git.hg/obj/depends.frag.mk with COMPONENTS_build = xen ioemu blktap install-image-base kernel-rhel4x kernel-rhel6-i686 kernel-rhel6-x86_64 kernel-rhel61-i686 kernel-rhel61-x86_64 kernel-dom0 kernel-dom0-pvops kernel-csp kernel-debian-source kernel-debian-etch-amd64 kernel-debian-etch-i386 kernel-generic-source kernel-generic-rpm-i686 kernel-debian-lenny kernel-netback kernel-iscsitarget branding gcc-dom0 uclibc-kbd dom0 ddk dvsc dlvm xsconsole uclibc-toolchain uclibc-xen driverdomain-network driverdomain-iscsitarget pvdrivers-win template-debian-etch template-debian-etch-amd64 xgt-package install-image docs eulas rhel45-guest-installer rhel46-guest-installer rhel47-guest-installer rhel48-guest-installer rhel50-guest-installer rhel51-guest-installer rhel52-guest-installer rhel53-guest-installer rhel54-guest-installer rhel55-guest-installer rhel56-guest-installer rhel57-guest-installer rhel60-guest-installer rhel61-guest-installer rhel62-guest-installer ubuntu-guest-installer linux-guest-loader binary-iso guest-packages-rhel4x guest-packages-rhel6x guest-packages-PyPAM guest-packages-SDL guest-packages-biosdevname guest-packages-cyrus-sasl guest-packages-dbus guest-packages-directfb guest-packages-dm-multipath guest-packages-e2fsprogs guest-packages-elasticsyslog guest-packages-ethtool guest-packages-fbi guest-packages-firmware guest-packages-gdisk guest-packages-hdparm guest-packages-hwdata guest-packages-iproute2 guest-packages-ipset guest-packages-iptables guest-packages-irqbalance guest-packages-kexec guest-packages-libpcap guest-packages-linux-firmware guest-packages-lvm guest-packages-mbootpack guest-packages-mcelog guest-packages-mercurial guest-packages-mkinitrd guest-packages-net-snmp guest-packages-open-iscsi guest-packages-openssl guest-packages-oprofile guest-packages-pam guest-packages-simplejson guest-packages-smartmontools guest-packages-splashy guest-packages-sysfsutils guest-packages-sysklogd guest-packages-tcpdump guest-packages-udhcp guest-packages-vastsky guest-packages-vhostmd guest-packages-vncsnapshot guest-packages-xenserver-lsb guest-packages-dom0 guest-packages-dom0-kernel guest-packages-csp-kernel guest-packages-dbusproxy guest-packages-vcputune guest-packages-pyserial guest-utilities-rpm guest-utilities-deb dom0-dists chroot-dom0 chroot-centos5 chroot-rhel45 chroot-rhel46 chroot-rhel47 chroot-rhel48 chroot-rhel5 chroot-rhel51 chroot-rhel52 chroot-rhel53 chroot-rhel54 chroot-rhel55 chroot-rhel56 chroot-rhel57 chroot-rhel6 chroot-rhel61 chroot-sles100 chroot-sles101 chroot-sles102 chroot-sles103 chroot-sles110 chroot-etch chroot-lenny ocaml api-libs api-utils api v6 api-bindings syslinux tools-iso win-tools-iso vncterm dotnet-packages-ref xenadmin-ref sm sm-closed sources license product xe-phase-1 xe-phase-2 xe-phase-3 kernel-phase-1 gui-phase-1 docs-phase-1 support-phase-1 all-phase sdktest binary-packages poolmon-deb poolmon-rpm vmmon-deb xha bugagg stunnelng likewise storagelink ocaml-libs openpegasus openvswitch transfer transfervm xs-cim xs-hp-esp integration-suite xencenter-ovf oem-phase-1 xenbootserver-template test-hotfix-1 test-hotfix-2 test-hotfix-3 test-hotfix-3b test-hotfix-4 test-hotfix-4b test-hotfix-5 test-gitbuild cloud-supp vpx-conversion vpx-conversion-rpm conversion-ref vpx-dlvm vpx-dlvm-rpm vpx-wlb vpx-wlb-rpm vpx-license-server vpx-license-server-rpm python-libs remote-ops filesystem-summarise stunnel isl_buildenv xs-netscaler auto-cert-kit guest-templates supp-pack-build tboot dev-pack wsproxy
ln -sf /usr/groups/xen/carbon/trunk-ring3/latest/manifest /usr/local/builds/build-xen-git.hg/obj/manifest.input
-rw-r--r-- 1 root root 0 Jul 31 21:48 /usr/local/builds/build-xen-git.hg/obj/.dirstamp
======> 1343771320 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: d4f184c
======> 1343771359 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/database/redo_log.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Aug 1, 2012

djs55/xen-api@9939238 ⇒ 3a063dc: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
======> 1343820512 Build: Regenerating /usr/local/builds/build-xen-git.hg/obj/depends.frag.mk with COMPONENTS_build = xen ioemu blktap install-image-base kernel-rhel4x kernel-rhel6-i686 kernel-rhel6-x86_64 kernel-rhel61-i686 kernel-rhel61-x86_64 kernel-dom0 kernel-dom0-pvops kernel-csp kernel-debian-source kernel-debian-etch-amd64 kernel-debian-etch-i386 kernel-generic-source kernel-generic-rpm-i686 kernel-debian-lenny kernel-netback kernel-iscsitarget branding gcc-dom0 uclibc-kbd dom0 ddk dvsc dlvm xsconsole uclibc-toolchain uclibc-xen driverdomain-network driverdomain-iscsitarget pvdrivers-win template-debian-etch template-debian-etch-amd64 xgt-package install-image docs eulas rhel45-guest-installer rhel46-guest-installer rhel47-guest-installer rhel48-guest-installer rhel50-guest-installer rhel51-guest-installer rhel52-guest-installer rhel53-guest-installer rhel54-guest-installer rhel55-guest-installer rhel56-guest-installer rhel57-guest-installer rhel60-guest-installer rhel61-guest-installer rhel62-guest-installer ubuntu-guest-installer linux-guest-loader binary-iso guest-packages-rhel4x guest-packages-rhel6x guest-packages-PyPAM guest-packages-SDL guest-packages-biosdevname guest-packages-cyrus-sasl guest-packages-dbus guest-packages-directfb guest-packages-dm-multipath guest-packages-e2fsprogs guest-packages-elasticsyslog guest-packages-ethtool guest-packages-fbi guest-packages-firmware guest-packages-gdisk guest-packages-hdparm guest-packages-hwdata guest-packages-iproute2 guest-packages-ipset guest-packages-iptables guest-packages-irqbalance guest-packages-kexec guest-packages-libpcap guest-packages-linux-firmware guest-packages-lvm guest-packages-mbootpack guest-packages-mcelog guest-packages-mercurial guest-packages-mkinitrd guest-packages-net-snmp guest-packages-open-iscsi guest-packages-openssl guest-packages-oprofile guest-packages-pam guest-packages-simplejson guest-packages-smartmontools guest-packages-splashy guest-packages-sysfsutils guest-packages-sysklogd guest-packages-tcpdump guest-packages-udhcp guest-packages-vastsky guest-packages-vhostmd guest-packages-vncsnapshot guest-packages-xenserver-lsb guest-packages-dom0 guest-packages-dom0-kernel guest-packages-csp-kernel guest-packages-dbusproxy guest-packages-vcputune guest-packages-pyserial guest-utilities-rpm guest-utilities-deb dom0-dists chroot-dom0 chroot-centos5 chroot-rhel45 chroot-rhel46 chroot-rhel47 chroot-rhel48 chroot-rhel5 chroot-rhel51 chroot-rhel52 chroot-rhel53 chroot-rhel54 chroot-rhel55 chroot-rhel56 chroot-rhel57 chroot-rhel6 chroot-rhel61 chroot-sles100 chroot-sles101 chroot-sles102 chroot-sles103 chroot-sles110 chroot-etch chroot-lenny ocaml api-libs api-utils api v6 api-bindings syslinux tools-iso win-tools-iso vncterm dotnet-packages-ref xenadmin-ref sm sm-closed sources license product xe-phase-1 xe-phase-2 xe-phase-3 kernel-phase-1 gui-phase-1 docs-phase-1 support-phase-1 all-phase sdktest binary-packages poolmon-deb poolmon-rpm vmmon-deb xha bugagg stunnelng likewise storagelink ocaml-libs openpegasus openvswitch transfer transfervm xs-cim xs-hp-esp integration-suite xencenter-ovf oem-phase-1 xenbootserver-template test-hotfix-1 test-hotfix-2 test-hotfix-3 test-hotfix-3b test-hotfix-4 test-hotfix-4b test-hotfix-5 test-gitbuild cloud-supp vpx-conversion vpx-conversion-rpm conversion-ref vpx-dlvm vpx-dlvm-rpm vpx-wlb vpx-wlb-rpm vpx-license-server vpx-license-server-rpm python-libs remote-ops filesystem-summarise stunnel isl_buildenv xs-netscaler auto-cert-kit guest-templates supp-pack-build tboot dev-pack wsproxy
ln -sf /usr/groups/xen/carbon/trunk-ring3/latest/manifest /usr/local/builds/build-xen-git.hg/obj/manifest.input
-rw-r--r-- 1 root root 0 Aug 1 11:28 /usr/local/builds/build-xen-git.hg/obj/.dirstamp
======> 1343820516 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: 1a684ed
======> 1343820527 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/database/redo_log.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Aug 1, 2012

djs55/xen-api@9939238 ⇒ e69de64: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
======> 1343840361 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: 5d0aa9f
======> 1343840409 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/database/redo_log.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Aug 3, 2012

djs55/xen-api@9939238 ⇒ d0d5ccd: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: e69de64
======> 1344004405 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/database/redo_log.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Aug 6, 2012

djs55/xen-api@9939238 ⇒ 70c578f: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into /usr/local/builds/build-xen-git.hg/obj/repos/xen-api...
Refreshing cookie to: d0d5ccd
======> 1344265515 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 4, 2012

djs55/xen-api@9939238 ⇒ 1ff57c3: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 5, 2012

djs55/xen-api@9939238 ⇒ 4046907: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 5, 2012

djs55/xen-api@9939238 ⇒ f749db6: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 5, 2012

djs55/xen-api@9939238 ⇒ b596092: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 5, 2012

djs55/xen-api@9939238 ⇒ e7c4abd: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 8, 2012

djs55/xen-api@9939238 ⇒ 9ee3df5: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 8, 2012

djs55/xen-api@9939238 ⇒ 7c62863: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 10, 2012

djs55/xen-api@9939238 ⇒ 3024628: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 10, 2012

djs55/xen-api@9939238 ⇒ e741bb5: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 13, 2012

djs55/xen-api@9939238 ⇒ 1fdd46f: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 15, 2012

djs55/xen-api@9939238 ⇒ f463ff6: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 17, 2012

djs55/xen-api@9939238 ⇒ f84cbb2: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 18, 2012

djs55/xen-api@9939238 ⇒ 63d41a8: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 23, 2012

djs55/xen-api@9939238 ⇒ 4ca1a4c: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 23, 2012

djs55/xen-api@9939238 ⇒ d3754ae: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 25, 2012

djs55/xen-api@9939238 ⇒ 05ed6e8: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Oct 31, 2012

djs55/xen-api@9939238 ⇒ 42a7d48: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Nov 2, 2012

djs55/xen-api@9939238 ⇒ f2c23f6: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Nov 5, 2012

djs55/xen-api@9939238 ⇒ dbd1565: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Nov 9, 2012

djs55/xen-api@9939238 ⇒ 2c0fbe1: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Nov 9, 2012

djs55/xen-api@9939238 ⇒ 8cddb3a: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Nov 10, 2012

djs55/xen-api@9939238 ⇒ f0f8d51: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Nov 20, 2012

djs55/xen-api@9939238 ⇒ 0817d46: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Nov 22, 2012

djs55/xen-api@9939238 ⇒ 4baae9e: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Nov 23, 2012

djs55/xen-api@9939238 ⇒ 094c895: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vif_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vif_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Nov 26, 2012

djs55/xen-api@9939238 ⇒ ae24881: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vif_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vif_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Copy link
Contributor

xen-git commented Nov 26, 2012

djs55/xen-api@9939238 ⇒ 1bfdaaf: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vif_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vif_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@jonludlam
Copy link
Contributor

I'm going to close this until the branch can be rebased.

@jonludlam jonludlam closed this Mar 27, 2013
lindig added a commit to lindig/xen-api that referenced this pull request Nov 9, 2021
@lindig
Merge pull request xapi-project#756 from xapi-project/edwintorok-patch-1
95a9a9f 
Do not lose stacktraces when handling exception in VM.receive_memory
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@djs55 @xen-git @robhoes @jonludlam