Brandon Williams 0f13031023 Merge branch 'cassandra-2.0' into trunk ... Conflicts: build.xml test/conf/log4j-junit.properties		2013-10-14 14:19:20 -05: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-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	Remove memory emergency pressure valve logic	2013-03-11 19:24:27 +03: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
log4j-junit.properties	Add PigUnit unit tests.	2013-10-14 14:13:18 -05:00
logback-test.xml	fix error in logback config files, causing INFO to spew unwantedly	2013-09-17 22:09:42 -04:00