From: Peter Maydell Date: Wed, 15 Jul 2015 13:23:58 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/cody/tags/jtc-for-upstream-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=711dc6f36b74fe65a6e5a1847f1152717d887f8a;p=qemu.git Merge remote-tracking branch 'remotes/cody/tags/jtc-for-upstream-pull-request' into staging # gpg: Signature made Wed Jul 15 03:25:16 2015 BST using RSA key ID C0DE3057 # gpg: Good signature from "Jeffrey Cody " # gpg: aka "Jeffrey Cody " # gpg: aka "Jeffrey Cody " # 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: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057 * remotes/cody/tags/jtc-for-upstream-pull-request: block/curl: Don't lose original error when a connection fails. mirror: correct buf_size block: keep bitmap if incremental backup job is cancelled blockdev: no need to drain in qmp_block_commit block/mirror: Sleep periodically during bitmap scanning Signed-off-by: Peter Maydell --- 711dc6f36b74fe65a6e5a1847f1152717d887f8a