diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-13 12:55:47 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-13 12:55:47 +0100 |
| commit | e0b4891ae6647b0009b5c0f877255e6723bffed8 (patch) | |
| tree | ef8f623ed856e465a82b5ae4afa21d5743324816 /io/channel-socket.c | |
| parent | 9746211baa6ff1275e9c726c6f3a3bcfe4b1f8bd (diff) | |
| parent | 56faeb9bb6872b3f926b3b3e0452a70beea10af2 (diff) | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Fri 09 Jun 2017 13:41:59 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:
block/gluster.c: Handle qdict_array_entries() failure
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'io/channel-socket.c')
0 files changed, 0 insertions, 0 deletions