diff options
| author | Peter Maydell | 2018-03-13 19:29:28 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-03-13 19:29:28 +0100 |
| commit | 3a2e46ae1de4f45b88211306a2b6c0c5efd368ab (patch) | |
| tree | afe05674b79aa39807a56a1336741e8f2925729e /scripts/qmp/qmp.py | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request'... (diff) | |
| parent | block: include original filename when reporting invalid URIs (diff) | |
| download | qemu-3a2e46ae1de4f45b88211306a2b6c0c5efd368ab.tar.gz qemu-3a2e46ae1de4f45b88211306a2b6c0c5efd368ab.tar.xz qemu-3a2e46ae1de4f45b88211306a2b6c0c5efd368ab.zip | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 13 Mar 2018 12:28:21 GMT
# gpg: using RSA key BDBE7B27C0DE3057
# 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:
block: include original filename when reporting invalid URIs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qmp/qmp.py')
0 files changed, 0 insertions, 0 deletions