From: Peter Maydell Date: Tue, 21 Jul 2015 19:56:20 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-07-21-tag' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b9c46307996856d03ddc1527468ff5401ac03a79;p=qemu.git Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-07-21-tag' into staging tag for qga-pull-2015-07-21 Small fix to correct schema versioning annotations for recently-added GuestDiskBusType enum values. Not the end of the world, but ideally this inconsistency would be corrected prior to 2.4 release. # gpg: Signature made Tue Jul 21 20:43:24 2015 BST using RSA key ID F108B584 # gpg: Good signature from "Michael Roth " # gpg: aka "Michael Roth " # gpg: aka "Michael Roth " # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: CEAC C9E1 5534 EBAB B82D 3FA0 3353 C9CE F108 B584 * remotes/mdroth/tags/qga-pull-2015-07-21-tag: qga: fixed versions for guest bus types in qapi-schema Signed-off-by: Peter Maydell --- b9c46307996856d03ddc1527468ff5401ac03a79