diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-04-12 18:09:16 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-04-12 18:09:16 +0200 |
| commit | 5158ac58306b3e8644fc020730f651fe74aa6674 (patch) | |
| tree | e65d377bcc840ab4d3ce660b5b659f06822e1125 /blockdev.c | |
| parent | c4189d85bcdaa27a9ec892146a652092fec704d0 (diff) | |
| parent | 3ef3dcef563e231a13543264975b9ef75080f9b3 (diff) | |
| download | qemu-5158ac58306b3e8644fc020730f651fe74aa6674.tar.gz | |
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-12' into queue-block
Block patches for 2.6-rc2.
# gpg: Signature made Tue Apr 12 18:08:20 2016 CEST using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
* mreitz/tags/pull-block-for-kevin-2016-04-12:
qemu-iotests: iotests.py: get rid of __all__
qemu-iotests: 068: don't require KVM
qemu-iotests: 148: properly skip test if quorum support is missing
qemu-iotests: iotests.VM: remove qtest socket on error
qemu-iotests: fix 051 on non-PC architectures
qemu-iotests: check: don't place files with predictable names in /tmp
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'blockdev.c')
0 files changed, 0 insertions, 0 deletions