Add accepted-by tag to 0-9-1 json.
Added tag rabbitmq_v2_1_0 for changeset 059d9ebd55d5
Merged bug23214 (basic.consume's 'filter' should be called 'arguments')
rename basic.consume's 'filter' arg to 'arguments', as per the 0-9-1 …
Added tag rabbitmq_v2_0_0 for changeset f8b34141e6cb
add unexpected_frame error code to 0-8 spec
we agreed we'd use the same error codes across version, but somehow
missed this one.
Merge amqp_0_9_1 into default.
Merge default into amqp_0_9_1
merge bug22889 into default
Merge bug 22889 into amqp_0_9_1.
Added tag rabbitmq_v1_8_1 for changeset 87048ea44df5
revert gratuitous change
merge bug22901 into default
Make acc win in domains_merger.
Revert these two merges to new into old, I can't remember why I swapp…
…ed them round and it makes things rather clearer this way.
Merging bug22901 into 22889.
More renaming :)
Merged bug22901 into bug22889.
Stylistic changes: Rename old to acc, allow_overwrite to allow_accumu…
…late, and o to merged. Add comment. Tweak usage message.
Remove accidental print statement
...and back out all those checks after discussion with Matthias.
Merged bug22901 into bug22889
Refactor merge_dict_lists_by a bit.
Actually, default-value conflicts all over the place.
Always break when there's
- a method argument defined with two different types or default values
- a method with two different "synchronous" settings
Merge bug 22901 into bug 22889.
- a domain defined with two different types
- a constant defined with two different values
- differences in properties signatures
Restart bug 22889
Merge bug 22901
Add --allow-overwrite command line switch.
Major and minor are integers, revision should be too.
Rename JSON files, and merge the 0-8 extensions back into our main 0-…