From: Anthony Liguori Date: Mon, 12 Aug 2013 13:32:36 +0000 (-0500) Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3bba9c115ba31f53fb9fc0a2711bf36c0ed6f031;p=qemu.git Merge remote-tracking branch 'kwolf/for-anthony' into staging # By Mike Qiu # Via Kevin Wolf * kwolf/for-anthony: block: Bugfix 'format' and 'snapshot' used in drive option Message-id: 1376071141-3214-1-git-send-email-kwolf@redhat.com Signed-off-by: Anthony Liguori --- 3bba9c115ba31f53fb9fc0a2711bf36c0ed6f031