diff options
| author | Peter Maydell | 2019-10-07 16:40:53 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-10-07 16:40:53 +0200 |
| commit | 560009f2c8b57b7cdd31a5693ea86ab369382f49 (patch) | |
| tree | b70443f11809a24ce078ca8f4a975eebba488b60 /qemu-img.c | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191004' into... (diff) | |
| parent | iotests: Remove Python 2 compatibility code (diff) | |
| download | qemu-560009f2c8b57b7cdd31a5693ea86ab369382f49.tar.gz qemu-560009f2c8b57b7cdd31a5693ea86ab369382f49.tar.xz qemu-560009f2c8b57b7cdd31a5693ea86ab369382f49.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- Fix internal snapshots with typical -blockdev setups
- iotests: Require Python 3.6 or later
# gpg: Signature made Fri 04 Oct 2019 10:59:21 BST
# gpg: using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
iotests: Remove Python 2 compatibility code
iotests: Require Python 3.6 or later
iotests: Test internal snapshots with -blockdev
block/snapshot: Restrict set of snapshot nodes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-img.c')
0 files changed, 0 insertions, 0 deletions