From: Peter Maydell Date: Mon, 13 Mar 2017 11:26:36 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging X-Git-Tag: v2.9.0-rc2~61 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b1616fe0e2a311f5951cc51800a17a920b20a129;p=mirror_qemu.git Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging # gpg: Signature made Fri 10 Mar 2017 07:15:38 GMT # gpg: using RSA key 0xCA35624C6A9171C6 # gpg: Good signature from "Fam Zheng " # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6 * remotes/famz/tags/docker-pull-request: docker/dockerfiles/debian-s390-cross: include clang tests/docker: support proxy / corporate firewall Signed-off-by: Peter Maydell --- b1616fe0e2a311f5951cc51800a17a920b20a129