summaryrefslogtreecommitdiff
path: root/block/rbd.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-02-28 13:41:03 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-02-28 13:41:03 +0000
commitc8c0a1a784cdf70ecea50e93213137c6c89337a7 (patch)
tree3c23f59896f1a706d5a7a6d15ac860abf68f709d /block/rbd.c
parenta57aaa4e746177ccb9cba1742e0ed31a45710d2a (diff)
parent51654aa52a94612edfaf76dcb51c0a0b7821c90d (diff)
downloadqemu-c8c0a1a784cdf70ecea50e93213137c6c89337a7.zip
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 28 Feb 2017 04:34:34 GMT # gpg: using RSA key 0xBDBE7B27C0DE3057 # 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: iscsi: add missing colons to the qapi docs block/mirror: fix broken sparseness detection Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/rbd.c')
0 files changed, 0 insertions, 0 deletions