Jake Luciani 18ce8c72a3 Merge branch 'cassandra-2.0' into cassandra-2.1.0 ... Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/db/DataTracker.java test/unit/org/apache/cassandra/db/CommitLogTest.java		2014-08-01 11:16:57 -04:00
..
triggers	Fix trigger directory detection code	2013-08-03 11:21:07 -07:00
cassandra-rackdc.properties	Make Ec2Region's datacenter name configurable	2013-01-14 20:57:25 -08:00
cassandra-rackdc.properties.mod	Auto reload GossipingPropertyFileSnitch config	2014-03-06 11:22:47 -06:00
cassandra-topology.properties	rename test cassandra-rack.properties to cassandra-topology	2010-10-14 20:35:06 +00:00
cassandra-topology.yaml	Add yaml network topology snitch for mixed ec2/other envs	2013-04-02 14:56:32 -05:00
cassandra.yaml	Merge branch 'cassandra-2.0' into cassandra-2.1.0	2014-08-01 11:16:57 -04:00
commitlog_archiving.properties	Fix CommitLogReplayer date time issue	2013-09-14 16:05:54 -07:00
datacenters.properties	sanity-check replica count against number of nodes in the cluster. patch by mdennis; reviewed by jbellis for CASSANDRA-1191	2010-07-01 17:20:39 +00:00
logback-test.xml	Tuple types	2014-05-29 11:33:11 +02:00