Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging master
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 27 Jul 2016 15:31:01 +0000 (16:31 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 27 Jul 2016 15:31:01 +0000 (16:31 +0100)
commitdf5c50a208296c8303e591296f4e834a3b3fcb3d
treea5a14eda272efc162227678a5f8ab1843193c6df
parentc1fdfe9fcaf4e47ec3def98c5a7c52d2cae6c511
parent0965a41e998ab820b5d660c8abfc8c819c97bc1b
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>
qapi/block-core.json