diff options
| author | Peter Maydell | 2018-05-08 18:05:58 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-05-08 18:05:58 +0200 |
| commit | e5cd695266c5709308aa95b1baae499e4b5d4544 (patch) | |
| tree | f51fe9e7dfa9e86b42dab4c14617dce7ca848b8a /include | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request... (diff) | |
| parent | sheepdog: Fix sd_co_create_opts() memory leaks (diff) | |
| download | qemu-e5cd695266c5709308aa95b1baae499e4b5d4544.tar.gz qemu-e5cd695266c5709308aa95b1baae499e4b5d4544.tar.xz qemu-e5cd695266c5709308aa95b1baae499e4b5d4544.zip | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 08 May 2018 16:18:22 BST
# gpg: using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
sheepdog: Fix sd_co_create_opts() memory leaks
iotests: Add test for cancelling a mirror job
block/mirror: Make cancel always cancel pre-READY
block/mirror: honor ratelimit again
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions