From: Stefan Hajnoczi Date: Fri, 18 Nov 2016 11:05:48 +0000 (+0000) Subject: Merge remote-tracking branch 'vivier/tags/trivial-patches-pull-request' into staging X-Git-Tag: qemu-xen-4.9.0-rc1~54 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=363effe28b188460f8a0b075b841fdca1b2043d4;p=qemu-xen.git Merge remote-tracking branch 'vivier/tags/trivial-patches-pull-request' into staging # gpg: Signature made Thu 17 Nov 2016 10:18:58 AM GMT # gpg: using RSA key 0xF30C38BD3F2FBE3C # gpg: Good signature from "Laurent Vivier " # gpg: aka "Laurent Vivier " # gpg: aka "Laurent Vivier (Red Hat) " # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * vivier/tags/trivial-patches-pull-request: qapi-schema: clarify 'colo' state for MigrationStatus Message-id: 1479378016-19022-1-git-send-email-laurent@vivier.eu Signed-off-by: Stefan Hajnoczi --- 363effe28b188460f8a0b075b841fdca1b2043d4