diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-12 18:31:56 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-12 18:31:56 +0000 |
commit | 9d867123659ac32edd2a0b64cabe2dca544f1d0e (patch) | |
tree | 5c0913a438ea78cf1ad36867cdcdd06c69224178 /scripts/refresh-pxe-roms.sh | |
parent | cfc3fef6b4e493bf1a7ee16790ad584e20dfbbd1 (diff) | |
parent | b35203b227261961ff1da9b77b546c1919968bee (diff) |
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
qmp-shell: fix nested json regression
One small bug fix.
# gpg: Signature made Tue 12 Mar 2019 02:16:24 GMT
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/python-next-pull-request:
qmp-shell: fix nested json regression
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/refresh-pxe-roms.sh')
0 files changed, 0 insertions, 0 deletions