Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-02-22' into queue...
commitfe243e4881bc9e09767dba05f15acb016cfa7a52
authorKevin Wolf <kwolf@redhat.com>
Mon, 22 Feb 2016 15:57:50 +0000 (22 16:57 +0100)
committerKevin Wolf <kwolf@redhat.com>
Mon, 22 Feb 2016 15:57:50 +0000 (22 16:57 +0100)
tree34f9b8dd3fc7e94d177ce71fd6c59e5e5853f2a0
parentd310d85bf4472b6af9ff0235d397014dad713b8c
parent43e15ed4fded6be585072a6dd2ef8dc3956bad67
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-02-22' into queue-block

Block patches of the last three weeks.

# gpg: Signature made Mon Feb 22 16:55:33 2016 CET using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"

* mreitz/tags/pull-block-for-kevin-2016-02-22:
  qemu-iotests: 140: make description slightly more verbose
  qemu-iotests: 140: don't use IDE device
  qemu-iotests: 067: ignore QMP events
  blockdev: unset inappropriate flags when changing medium

Signed-off-by: Kevin Wolf <kwolf@redhat.com>