Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-03-18' into staging

[qemu.git] / tests / qapi-schema / flat-union-bad-base.err

diff --git a/tests/qapi-schema/flat-union-bad-base.err b/tests/qapi-schema/flat-union-bad-base.err
index 79b8a71eb8778a8dd132499da647663ad0e001e8..bee24a217ae52fbe711630d59e53bcaf0d98be14 100644 (file)
--- a/tests/qapi-schema/flat-union-bad-base.err
+++ b/tests/qapi-schema/flat-union-bad-base.err
@@ -1 +1 @@
-tests/qapi-schema/flat-union-bad-base.json:9: 'base' for union 'TestUnion' should be a type name
+tests/qapi-schema/flat-union-bad-base.json:8: 'string' (member of TestTypeA) collides with 'string' (base of TestUnion)