| commit | e32fb6da7e479e644d0de4d2f4fac76fa2efb46f | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 2 Jun 2017 15:51:17 +0000 (2 16:51 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 2 Jun 2017 15:51:17 +0000 (2 16:51 +0100) | ||
| tree | 13d1a2ae0708612b88362fa9612e20e537772d4d | treesnapshot (tar.gz zip) |
| parent | 1448228af3f44f3f83870777af884b507011a519 | commitdiff |
| parent | df3a429ae82c0f45becdfab105617701d75e0f05 | commitdiff |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Fri 02 Jun 2017 16:32:39 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:
gluster: add support for PREALLOC_MODE_FALLOC
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Fri 02 Jun 2017 16:32:39 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:
gluster: add support for PREALLOC_MODE_FALLOC
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>