diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-04-03 10:09:58 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-04-03 10:09:58 +0100 |
| commit | 6954cdc070b4209cc468263455670d8b02765a95 (patch) | |
| tree | 83fae1f529bef142b654076f6862ef1419c31f53 /qom/container.c | |
| parent | 95b31d709ba343ad237c3630047ee7438bac4065 (diff) | |
| parent | 34634ca28688652198f77d7001c0f1e204434663 (diff) | |
| download | qemu-6954cdc070b4209cc468263455670d8b02765a95.zip qemu-6954cdc070b4209cc468263455670d8b02765a95.tar.gz qemu-6954cdc070b4209cc468263455670d8b02765a95.tar.bz2 | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Sat 01 Apr 2017 02:23:29 BST
# gpg: using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
block/curl: Check protocol prefix
qapi/curl: Extend and fix blockdev-add schema
rbd: Fix regression in legacy key/values containing escaped :
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qom/container.c')
0 files changed, 0 insertions, 0 deletions