[Xen-changelog] [qemu-xen master] Merge remote-tracking branch 'vivier/tags/trivial-patches-pull-request' into staging

[patchbot@xxxxxxx]

commit 363effe28b188460f8a0b075b841fdca1b2043d4
Merge: e3cadac073a99489df1627be56c3f487f5cb9e31 
252093a726eb8aefdea13544554c24f7704555b4
Author:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
AuthorDate: Fri Nov 18 11:05:48 2016 +0000
Commit:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
CommitDate: Fri Nov 18 11:05:48 2016 +0000

    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 <lvivier@xxxxxxxxxx>"
    # gpg:                 aka "Laurent Vivier <laurent@xxxxxxxxx>"
    # gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@xxxxxxxxxx>"
    # 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@xxxxxxxxx
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>

 qapi-schema.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog