diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-29 19:54:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-29 19:54:49 +0100 |
| commit | 553934db664ecee676650fac0330dceff3531736 (patch) | |
| tree | 3050cec0a882c43553cc3a7735d785746327d7b7 /net/Makefile.objs | |
| parent | 5b8e6b4cc279e4434ddda94a6b2848834883ec9c (diff) | |
| parent | 409d54986d47b8279c70591e65ee4f3b1771944a (diff) | |
| download | qemu-553934db664ecee676650fac0330dceff3531736.zip qemu-553934db664ecee676650fac0330dceff3531736.tar.gz qemu-553934db664ecee676650fac0330dceff3531736.tar.bz2 | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 29 Mar 2016 01:48:09 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:
qemu-iotests: add no-op streaming test
qemu-iotests: fix test_stream_partial()
block: never cancel a streaming job without running stream_complete()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/Makefile.objs')
0 files changed, 0 insertions, 0 deletions