aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/qapi-commands.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-09-03 09:50:37 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-09-03 09:50:37 +0100
commit0eac5986fc4cfe845d6d656c3a4dc29e004b3a3e (patch)
tree0e00d8248d8c8e337e96b3a3499c9b11af949f9d /scripts/qapi-commands.py
parentMerge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-09-01-v2-tag' into staging (diff)
parentblock: more check for replaced node (diff)
downloadqemu-0eac5986fc4cfe845d6d656c3a4dc29e004b3a3e.tar.xz
qemu-0eac5986fc4cfe845d6d656c3a4dc29e004b3a3e.zip
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Wed 02 Sep 2015 17:01:33 BST using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" * remotes/stefanha/tags/block-pull-request: block: more check for replaced node MAINTAINERS: add responsible person for Parallels format driver Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi-commands.py')
0 files changed, 0 insertions, 0 deletions