cassandra/test
Tyler Hobbs de1a96c8d4 Merge branch 'cassandra-3.0' into trunk
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/service/StorageServiceMBean.java
2016-04-21 16:18:06 -05:00
..
burn/org/apache/cassandra Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-30 19:47:14 +01:00
conf Merge branch 'cassandra-3.0' into trunk 2016-02-29 17:20:13 +00:00
data Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-17 10:42:20 -05:00
long/org/apache/cassandra Optimize the overlapping lookup by calculating all the bounds in advance. 2016-04-19 13:25:58 +02:00
microbench/org/apache/cassandra/test/microbench Add forgotten file for 9258 yet again 2016-01-07 11:36:57 +01:00
resources Integrate SASI index into Cassandra 2016-01-23 19:35:29 -08:00
unit/org/apache/cassandra Merge branch 'cassandra-3.0' into trunk 2016-04-21 16:18:06 -05:00