From: Kevin Wolf Date: Fri, 15 Apr 2016 15:59:42 +0000 (+0200) Subject: Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-15' into queue... X-Git-Tag: TizenStudio_2.0_p2.4~27^2~6^2~8^2~38^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cdc8845331cf789636dfa88dc47e22fcdaef4057;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-15' into queue-block Block patches for 2.6.0-rc3. # gpg: Signature made Fri Apr 15 17:57:30 2016 CEST using RSA key ID E838ACAD # gpg: Good signature from "Max Reitz " * mreitz/tags/pull-block-for-kevin-2016-04-15: nbd: Don't kill server on client that doesn't request TLS nbd: fix assert() on qemu-nbd stop nbd: Don't fail handshake on NBD_OPT_LIST descriptions qemu-iotests: 041: More robust assertion on quorum node qemu-iotests: place valgrind log file in scratch dir qemu-iotests: tests: do not set unused tmp variable qemu-iotests: common.rc: drop unused _do() qemu-iotests: drop unused _within_tolerance() filter Signed-off-by: Kevin Wolf --- cdc8845331cf789636dfa88dc47e22fcdaef4057