On Tue, Jul 25, 2017 at 10:59:36AM +0200, Kevin Wolf wrote: > Commits 70f17a1 ('error: Revert unwanted change of warning messages') > and e1824e5 ('qemu-iotests: Test 'info block'') had a semantic merge > conflict, which results in failure for qemu-iotests case 186. Fix the > reference output to consider the changes of 70f17a1. > > Signed-off-by: Kevin Wolf <kw...@redhat.com> > --- > tests/qemu-iotests/186.out | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
signature.asc
Description: PGP signature