diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-13 11:40:20 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-13 11:40:21 +0100 |
| commit | 8ede883cfaf92e99ed7527c319e62dc13ab934d8 (patch) | |
| tree | 88f935842ae57ee71e6b49da516ae19d4e3a4a60 /util/qemu-error.c | |
| parent | 7263da78045dc91cc207f350911efe4259e99b3c (diff) | |
| parent | c76d7aab81c264e3452e778f030fb3760e5edbb9 (diff) | |
| download | qemu-8ede883cfaf92e99ed7527c319e62dc13ab934d8.zip qemu-8ede883cfaf92e99ed7527c319e62dc13ab934d8.tar.gz qemu-8ede883cfaf92e99ed7527c319e62dc13ab934d8.tar.bz2 | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 13 Sep 2016 06:41:42 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:
qapi/block-core: add doc describing GlusterServer vs. SocketAddress
block/gluster: add support to choose libgfapi logfile
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-error.c')
0 files changed, 0 insertions, 0 deletions