Merge branch 'cassandra-1.2' into cassandra-2.0

This commit is contained in:
Brandon Williams 2013-11-22 12:02:32 -06:00
commit 8e0523ea6b
1 changed files with 1 additions and 1 deletions

2
debian/init vendored
View File

@ -25,7 +25,7 @@ CASSANDRA_HOME=/usr/share/cassandra
FD_LIMIT=100000
# The first existing directory is used for JAVA_HOME if needed.
JVM_SEARCH_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun"
JVM_SEARCH_DIRS="/usr/lib/jvm/default-java"
[ -e /usr/share/cassandra/apache-cassandra.jar ] || exit 0
[ -e /etc/cassandra/cassandra.yaml ] || exit 0