Aleksey Yeschenko f6fda9c69c Merge branch 'cassandra-1.2' into cassandra-2.0 ... Conflicts: src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java		2013-09-11 00:57:01 +03:00
..
conf	Fix trigger directory detection code	2013-08-03 11:21:07 -07:00
data	Upgrade Thrift to 0.9.1	2013-08-30 02:57:12 +03:00
long/org/apache/cassandra	replace import junit.framework.* with org.junit.* (junit3 vs junit4)	2013-08-31 21:33:08 -04:00
resources	new json format with row level deletion; patch by David Alves, reviewed by yukim for CASSANDRA-4054	2012-07-12 10:40:24 -05:00
system	update test for separate paxos/commit CLs	2013-08-05 16:27:39 -05:00
unit/org/apache/cassandra	Merge branch 'cassandra-1.2' into cassandra-2.0	2013-09-11 00:57:01 +03:00
cassandra.in.sh	Ninja-unify 1.1/1.2/2.0 system tests	2013-05-06 01:56:43 +03:00