Jonathan Ellis 5ab5e1bbd1 merge from 0.6 ... git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@959197 13f79535-47bb-0310-9956-ffa450edef68		2010-06-30 05:48:24 +00:00
..
conf	Fix bootstrap with DSS and add endpoint caching.	2010-06-14 21:53:09 +00:00
data/legacy-sstables/b/Keyspace1	implement a legacy sstable test. Patch by Stu Hood, reviewed by Gary Dusbabek. CASSANDRA-767	2010-04-14 19:51:55 +00:00
long/org/apache/cassandra	add Clock structure as a prelude to full vector clock support. patch by Sylvain Lebresne and Kelvin Kakugawa for CASSANDRA-1070; reviewed by johano and jbellis	2010-05-26 04:45:44 +00:00
resources	use hex keys in sstable import/export. Patch by Stu Hood, reviewed by Gary Dusbabek. CASSANDRA-767	2010-04-14 19:53:43 +00:00
system	avro multget_slice() + functional tests	2010-06-17 21:57:50 +00:00
unit/org/apache/cassandra	merge from 0.6	2010-06-30 05:48:24 +00:00
cassandra.in.sh	use ivy for google-collect; remove local copy	2010-02-17 16:43:47 +00:00