cassandra/conf
Marcus Eriksson 35b2151369 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/CassandraDaemon.java
2014-03-18 08:09:02 +01:00
..
triggers add triggers README 2013-08-17 19:13:58 -06:00
README.txt Fix logback config in scripts and packaging. 2014-01-10 09:31:12 -06:00
cassandra-env.sh Add in forgotten MX4J variables to cassandra-env.sh 2014-03-16 11:34:36 -07:00
cassandra-rackdc.properties Allow GPFS to reconnect to the internal IP. 2013-06-14 11:21:52 -05:00
cassandra-topology.properties Add comments to topology file about ipv6 configuration. 2011-03-15 17:06:24 +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 2014-03-18 08:09:02 +01:00
commitlog_archiving.properties Additional NEWS and test fixes for 2.0 (part of CASSANDRA-5909) 2013-09-14 17:45:00 -07:00
cqlshrc.sample Switch cqlsh from cassandra-dbapi2 to python-driver 2014-03-12 15:02:14 -07:00
logback-tools.xml Fix logback config in scripts and packaging. 2014-01-10 09:31:12 -06:00
logback.xml Fix logback config in scripts and packaging. 2014-01-10 09:31:12 -06:00
metrics-reporter-config-sample.yaml Add configurable metrics reporting 2013-10-01 14:25:42 -05:00

README.txt

Required configuration files
============================

cassandra.yaml: main Cassandra configuration file
logback.xml: logback configuration file for Cassandra server


Optional configuration files
============================

cassandra-topology.properties: used by PropertyFileSnitch