summary refs log tree commit diff stats
path: root/scripts/qapi/commands.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-04-10 23:42:14 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-04-10 23:42:14 +0100
commitac4ba87ae0738d7a77708f8ce31ae2378ab99654 (patch)
treefdc416a63bfef6d11b2de4bb314fb6a21b4f4d77 /scripts/qapi/commands.py
parent26d6a7c87b05017ffabffb5e16837a0fccf67e90 (diff)
parenta18a73d7472e6ff5bc1e5f7fb9f7a42464295d03 (diff)
downloadfocaccia-qemu-ac4ba87ae0738d7a77708f8ce31ae2378ab99654.tar.gz
focaccia-qemu-ac4ba87ae0738d7a77708f8ce31ae2378ab99654.zip
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180410a' into staging
Migration reversion pull for 2.12

One to revert after we decided it needs some more thinking.

# gpg: Signature made Tue 10 Apr 2018 16:02:17 BST
# gpg:                using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20180410a:
  Revert "migration: Don't activate block devices if using -S"

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi/commands.py')
0 files changed, 0 insertions, 0 deletions