Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 f10d2ed95 -> d3085b1ba
Avoid repetition of JVM_OPTS in debian package patch by urandom; reviewed by mshuler for CASSANDRA-8821 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d8436f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d8436f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d8436f9 Branch: refs/heads/cassandra-2.2 Commit: 9d8436f922ad2d4ee7edb647e2e1677c2194ad61 Parents: da8be1c Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Oct 21 14:26:22 2015 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Oct 21 14:26:22 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + debian/init | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d8436f9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 2a28a86..31ae1c0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d8436f9/debian/init ---------------------------------------------------------------------- diff --git a/debian/init b/debian/init index 56f2523..aff54e1 100644 --- a/debian/init +++ b/debian/init @@ -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
