Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-09-01-v3' into staging

[qemu.git] / tests / qapi-schema / alternate-conflict-bool-string.json

# alternate branches of 'str' type conflict with all scalar types
{ 'alternate': 'Alt',
  'data': { 'one': 'bool',
            'two': 'str' } }