diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-07 19:12:45 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-07 19:12:45 +0100 |
commit | 30c6672aa4b4bc9bdba3a7e46c49bba191660143 (patch) | |
tree | 54f3f6fdf324a65a5d654cd18b6fb9ce1b934395 /.mailmap | |
parent | 9861b71fd63f04175fddd1e93a417bae4a7808d7 (diff) | |
parent | 970311646a701eecb103eb28093e8924d2fa6861 (diff) |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
v2:
* Drop block/nfs patch since it exposes an unfinished QAPI interface [kwolf]
# gpg: Signature made Tue Jul 7 14:29:47 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
blockjob: add block_job_release function
block/raw-posix: Don't think /dev/fd/<NN> is a floppy drive.
block: Use bdrv_drain to replace uncessary bdrv_drain_all
block: Initialize local_err in bdrv_append_temp_snapshot
block: update bdrv_drain_all()/bdrv_drain() comments
qcow2: remove unnecessary check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions