From: Peter Maydell Date: Tue, 12 Mar 2019 18:31:56 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9d867123659ac32edd2a0b64cabe2dca544f1d0e;p=qemu.git 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 " [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 --- 9d867123659ac32edd2a0b64cabe2dca544f1d0e