Merge branch 'cassandra-1.2' into trunk

This commit is contained in:
Brandon Williams 2013-03-20 14:03:21 -05:00
commit 35543915bb
1 changed files with 3 additions and 0 deletions

View File

@ -2,6 +2,9 @@ conf/log4j-server.properties etc/cassandra
conf/cassandra.yaml etc/cassandra
conf/cassandra-env.sh etc/cassandra
conf/cassandra-rackdc.properties etc/cassandra
conf/commitlog_archiving.properties etc/cassandra
conf/cassandra-topology.properties etc/cassandra
conf/log4j-tools.properties etc/cassandra
debian/cassandra.in.sh usr/share/cassandra
debian/cassandra.conf etc/security/limits.d
debian/cassandra-sysctl.conf etc/sysctl.d