diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-20 14:42:09 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-20 14:42:09 +0100 |
| commit | fe98b18b6f8c1324b4940a6a1f1bf8d847c9d569 (patch) | |
| tree | 3ea38c5faacb29d977bff530116ee255e0dbd552 /tests/Makefile | |
| parent | 1f7685fafa6ba1354731a59822e5cc43323d6989 (diff) | |
| parent | d85fa9eb87ba736d2d5ce342fc35f507c8fe29f2 (diff) | |
| download | qemu-fe98b18b6f8c1324b4940a6a1f1bf8d847c9d569.tar.gz | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 19 Apr 2016 17:28:01 BST using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
* remotes/cody/tags/block-pull-request:
block/gluster: prevent data loss after i/o error
block/gluster: code movement of qemu_gluster_close()
block/gluster: return correct error value
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/Makefile')
0 files changed, 0 insertions, 0 deletions