Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-05-15' into staging

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

# we reject alternates with multiple string-like branches
{ 'enum': 'Enum',
  'data': [ 'hello', 'world' ] }
{ 'alternate': 'Alt',
  'data': { 'one': 'str',
            'two': 'Enum' } }