Avoid repetition of JVM_OPTS in debian package

patch by urandom; reviewed by mshuler for CASSANDRA-8821
This commit is contained in:
Sylvain Lebresne 2015-10-21 14:26:22 +02:00
parent da8be1c093
commit 9d8436f922
2 changed files with 1 additions and 10 deletions

View File

@ -1,4 +1,5 @@
2.1.12
* Avoid repetition of JVM_OPTS in debian package (CASSANDRA-8821)
* Fix potential NPE from handling result of SIM.highestSelectivityIndex (CASSANDRA-10550)
* Fix paging issues with partitions containing only static columns data
(CASSANDRA-10381)

10
debian/init vendored
View File

@ -30,16 +30,6 @@ FD_LIMIT=100000
# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
# Read Cassandra environment file.
. /etc/cassandra/cassandra-env.sh
if [ -z "$JVM_OPTS" ]; then
echo "Initialization failed; \$JVM_OPTS not set!" >&2
exit 3
fi
export JVM_OPTS
# Export JAVA_HOME, if set.
[ -n "$JAVA_HOME" ] && export JAVA_HOME