| commit | bd998d7cc8ced211def90e4225042d63dddecc54 | |
| author | Kevin Wolf <kwolf@redhat.com> | |
| Tue, 25 Jul 2017 08:59:36 +0000 (25 10:59 +0200) | ||
| committer | Max Reitz <mreitz@redhat.com> | |
| Tue, 25 Jul 2017 14:33:58 +0000 (25 16:33 +0200) | ||
| tree | f2f1d7ad1922c1a0d73a1cfd739a5b01a7712bfc | treesnapshot (tar.gz zip) |
| parent | b6b75a99dab760c902c3d355519e0dc2616872e1 | commitdiff |
qemu-iotests: Fix reference output for 186
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 <kwolf@redhat.com>
Message-id: 1500973176-29235-1-git-send-email-kwolf@redhat.com
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
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 <kwolf@redhat.com>
Message-id: 1500973176-29235-1-git-send-email-kwolf@redhat.com
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
| tests/qemu-iotests/186.out | diffblobblamehistory |