From: Anthony Liguori Date: Mon, 16 Dec 2013 17:43:27 +0000 (-0800) Subject: Merge remote-tracking branch 'kwolf/tags/for-anthony' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=80d6f5eae79b009bf3e02e59e9e225db42ddf887;p=qemu.git Merge remote-tracking branch 'kwolf/tags/for-anthony' into staging Block patches # gpg: Signature made Fri 13 Dec 2013 09:47:03 AM PST using RSA key ID C88F2FD6 # gpg: Can't check signature: public key not found # By Peter Lieven (2) and others # Via Kevin Wolf * kwolf/tags/for-anthony: blkdebug: Use QLIST_FOREACH_SAFE to resume IO qemu-img: make progress output more accurate during convert block: expect get_block_status errors in bdrv_make_zero block/vvfat: Fix compiler warnings for OpenBSD qapi-schema.json: Change 1.8 reference to 2.0 sheepdog: check if '-o redundancy' is passed from user Message-id: 1386956943-19474-1-git-send-email-kwolf@redhat.com Signed-off-by: Anthony Liguori --- 80d6f5eae79b009bf3e02e59e9e225db42ddf887