Brandon Williams fe598e77e6 Merge branch 'cassandra-1.2' into cassandra-2.0 ... Conflicts: build.xml src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java		2013-10-14 14:17:05 -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
log4j-server.properties	set level to DEBUG for tests (inadvertently changed to TRACE)	2011-03-30 19:06:03 +00:00