From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 27 Jul 2016 15:31:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
X-Git-Tag: TizenStudio_2.0_p4.0~6^2~12^2~6^2~79
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df5c50a208296c8303e591296f4e834a3b3fcb3d;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging

# gpg: Signature made Tue 26 Jul 2016 21:51:38 BST
# 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:
  mirror: double performance of the bulk stage if the disc is full
  block/gluster: fix doc in the qapi schema and member name

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

df5c50a208296c8303e591296f4e834a3b3fcb3d