diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-09-25 13:05:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-09-25 13:05:08 +0100 |
| commit | 32556acb5a02b39f2bd03fbb57642c49599e86d0 (patch) | |
| tree | 7c007252eaa625520a5b0724fa93c24e8213e9a2 /include/hw/s390x | |
| parent | f69d20fa8badbd6b515cc3d9e0a95b36f0410a46 (diff) | |
| parent | 637fa44ab80c6b317adf1d117494325a95daad60 (diff) | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 25 Sep 2018 04:51:25 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:
curl: Make sslverify=off disable host as well as peer verification.
block/rbd: add deprecation documentation for filename keyvalue pairs
block/rbd: add iotest for rbd legacy keyvalue filename parsing
block/rbd: Attempt to parse legacy filenames
block/rbd: pull out qemu_rbd_convert_options
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/s390x')
0 files changed, 0 insertions, 0 deletions