summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rename basic.consume's 'filter' arg to 'arguments', as per the 0-9-1 specbug23214Matthias Radestock2010-09-011-1/+1
* Added tag rabbitmq_v2_0_0 for changeset f8b34141e6cbMichael Bridgen2010-08-240-0/+0
* Merged headsrabbitmq_v2_0_0Emile Joubert2010-08-130-0/+0
|\
| * Added tag rabbitmq_v1_8_1 for changeset 87048ea44df5Emile Joubert2010-07-140-0/+0
* | add unexpected_frame error code to 0-8 specMatthias Radestock2010-07-301-0/+1
* | Merge amqp_0_9_1 into default.Simon MacMullen2010-07-300-0/+0
|\ \
| * \ Merge default into amqp_0_9_1amqp_0_9_1Simon MacMullen2010-07-300-0/+0
| |\ \ |/ / /
| * | Merge bug 22889 into amqp_0_9_1.Simon MacMullen2010-07-204-114/+133
| |\ \
| * \ \ Merge default into amqp_0_9_1Tony Garnock-Jones2010-06-302-13/+39
| |\ \ \
| * \ \ \ Merge default into amqp_0_9_1Simon MacMullen2010-06-221-19/+18
| |\ \ \ \
| * \ \ \ \ Merged default into amqp_0_9_1Emile Joubert2010-06-152-0/+412
| |\ \ \ \ \
| | * \ \ \ \ Merge default into amqp_0_9_1Tony Garnock-Jones2010-05-292-0/+412
| | |\ \ \ \ \
| | | * | | | | "true" => true. This requires no changes elsewhere because the python json li...Matthew Sackman2010-04-012-59/+59
| | | * | | | | Missed a ticket default 1 => 0 fixMatthew Sackman2010-03-181-1/+1
| | | * | | | | Add synchronous flag, and unify default values with default branch / 0.8 specMatthew Sackman2010-03-181-39/+62
| | | * | | | | Merging default into amqp_0_9_1Matthew Sackman2010-03-181-46/+82
| | | |\ \ \ \ \
| | | * | | | | | It's cluster-id that's deprecated, not app-idMichael Bridgen2009-10-061-2/+2
| | | * | | | | | merge default into amqp_0_9_1Tony Garnock-Jones2009-08-120-0/+0
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ merge default into amqp_0_9_1Tony Garnock-Jones2009-05-132-0/+389
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Add channel.open-ok's pre-deprecated channel-id field. I missed it earlier!Tony Garnock-Jones2009-05-131-1/+1
| | | | * | | | | | | Read revision from JSON spec, where presentTony Garnock-Jones2009-05-121-0/+1
| | | | * | | | | | | Initial 0-9-1 JSON, based on the 0-8 JSON + the diffs text docTony Garnock-Jones2009-04-131-0/+388
* | | | | | | | | | | merge bug22889 into defaultMatthias Radestock2010-07-303-39/+447
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | revert gratuitous changebug22889Matthias Radestock2010-07-091-1/+0
| * | | | | | | | | Merging bug22901 into 22889.Simon MacMullen2010-07-071-26/+26
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merged bug22901 into bug22889.Simon MacMullen2010-07-071-40/+44
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge bug22901Simon MacMullen2010-07-054-39/+448
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merged bug22901 into bug22889Simon MacMullen2010-07-051-9/+18
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge bug 22901 into bug 22889.Simon MacMullen2010-07-051-8/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Restart bug 22889Simon MacMullen2010-07-051-0/+1
| | * | | | | | | | | | | | | Merge bug 22901Simon MacMullen2010-07-051-26/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Major and minor are integers, revision should be too.Simon MacMullen2010-07-021-1/+1
| | * | | | | | | | | | | | | | Rename JSON files, and merge the 0-8 extensions back into our main 0-8 file.Simon MacMullen2010-07-023-39/+20
| | * | | | | | | | | | | | | | Remove close08 hack, and remove deprecated- prefix everywhere so it will merg...bug22885Simon MacMullen2010-06-241-30/+20
| | * | | | | | | | | | | | | | Merged bug 22901Simon MacMullen2010-06-241-0/+437
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Revert the lie that this file is 0-8Simon MacMullen2010-06-241-1/+1
| | | * | | | | | | | | | | | | | Re-add 0-8 JSON for the clients.Simon MacMullen2010-06-242-0/+678
| | | * | | | | | | | | | | | | | Claim to be 0-8 for the time being. This needs to be stripped out though.Simon MacMullen2010-06-231-1/+1
| | | * | | | | | | | | | | | | | Remove 0-8 specific JSON and use the unified one.Simon MacMullen2010-06-232-299/+58
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | merge bug22901 into defaultrabbitmq_v1_8_1Alexandru Scvortov2010-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Make acc win in domains_merger.bug22901Simon MacMullen2010-07-071-2/+2
* | | | | | | | | | | | | | | | Revert these two merges to new into old, I can't remember why I swapped them ...Simon MacMullen2010-07-071-9/+9
| |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | More renaming :)Simon MacMullen2010-07-071-26/+26
| |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Stylistic changes: Rename old to acc, allow_overwrite to allow_accumulate, an...Simon MacMullen2010-07-071-40/+44
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Remove accidental print statementSimon MacMullen2010-07-051-17/+13
* | | | | | | | | | | | | ...and back out all those checks after discussion with Matthias.Simon MacMullen2010-07-051-25/+10
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Refactor merge_dict_lists_by a bit.Simon MacMullen2010-07-051-9/+10
* | | | | | | | | | | | Actually, default-value conflicts all over the place.Simon MacMullen2010-07-051-1/+1
* | | | | | | | | | | | Always break when there'sSimon MacMullen2010-07-051-2/+8
* | | | | | | | | | | | Always break when there'sSimon MacMullen2010-07-051-3/+5
| |_|_|/ / / / / / / / |/| | | | | | | | | |