Jonathan Ellis 4fe8af8ea3 merge from 0.7 ... git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1043262 13f79535-47bb-0310-9956-ffa450edef68		2010-12-08 01:08:32 +00:00
..
conf	merge from 0.7	2010-11-19 16:28:40 +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	fix flush and compaction races with schema updates. patch by gdusbabek and jbellis. CASSANDRA-1715	2010-11-19 16:55:37 +00:00
resources	add ExpiringColumn support to sstable import/export	2010-11-29 19:36:08 +00:00
system	CQL TRUNCATE implementation + test	2010-11-27 02:22:22 +00:00
unit/org/apache/cassandra	prepend missing license blurb	2010-12-06 17:22:36 +00:00
cassandra.in.sh	avoid double-copy of flushed data by serializing directly to output file. patch by jbellis; reviewed by mdennis for CASSANDRA-270	2010-07-11 23:07:50 +00:00