Benedict Elliott Smith 184bb65fca Merge branch 'cassandra-2.1' into trunk ... Conflicts: CHANGES.txt		2015-01-21 16:52:20 +00:00
..
bin	Merge branch 'cassandra-2.0' into cassandra-2.1	2015-01-12 11:51:00 -06:00
lib	Support for UDTs, tuples, and collections in UDFs	2014-11-26 17:49:45 -06:00
stress	Merge branch 'cassandra-2.1' into trunk	2015-01-21 16:52:20 +00:00
cqlstress-counter-example.yaml	Improve stress workload realism	2014-09-07 21:19:58 +07:00
cqlstress-example.yaml	Extend Descriptor to include a format value and refactor reader/writer apis	2014-10-23 11:10:55 -04:00
cqlstress-insanity-example.yaml	Extend Descriptor to include a format value and refactor reader/writer apis	2014-10-23 11:10:55 -04:00