diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-05 17:03:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-05 17:03:32 +0100 |
| commit | 31370dbe5d68d146b8802933587d5341438646f0 (patch) | |
| tree | 46cb4c6dd3d800a45827cb9a00820764d3e25931 /tests | |
| parent | a226f7653620f8c5b570ca63c26df98bdc1d84c4 (diff) | |
| parent | 6a5c357fdbd4c91c5142f1b7ccf4658664b52ea2 (diff) | |
| download | qemu-31370dbe5d68d146b8802933587d5341438646f0.tar.gz | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.6
# gpg: Signature made Tue 05 Apr 2016 16:32:25 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
crypto: Avoid memory leak on failure
qemu-iotests: 149: Use "/usr/bin/env python"
block: Forbid I/O throttling on nodes with multiple parents for 2.6
block: forbid x-blockdev-del from acting on DriveInfo
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/149 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149 index bb5811d93b..52e23d2946 100755 --- a/tests/qemu-iotests/149 +++ b/tests/qemu-iotests/149 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (C) 2016 Red Hat, Inc. # |