[Qemu-commits] [qemu/qemu] 5f8343: qga: fixed versions for guest bus types in qapi-sc...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5f8343d0670e91adadb7898304c8ed4355af05a2
      
https://github.com/qemu/qemu/commit/5f8343d0670e91adadb7898304c8ed4355af05a2
  Author: Olga Krishtal <address@hidden>
  Date:   2015-07-21 (Tue, 21 Jul 2015)

  Changed paths:
    M qga/qapi-schema.json

  Log Message:
  -----------
  qga: fixed versions for guest bus types in qapi-schema

Signed-off-by: Olga Krishtal <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Eric Blake <address@hidden>
CC: Michael Roth <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
*added semi-colon to better delineate 2.2 vs. 2.4 versioning
Signed-off-by: Michael Roth <address@hidden>


  Commit: b9c46307996856d03ddc1527468ff5401ac03a79
      
https://github.com/qemu/qemu/commit/b9c46307996856d03ddc1527468ff5401ac03a79
  Author: Peter Maydell <address@hidden>
  Date:   2015-07-21 (Tue, 21 Jul 2015)

  Changed paths:
    M qga/qapi-schema.json

  Log Message:
  -----------
  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 <address@hidden>"
# gpg:                 aka "Michael Roth <address@hidden>"
# gpg:                 aka "Michael Roth <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/774ee4772b68...b9c463079968