Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0387E17D00 for ; Wed, 21 Oct 2015 12:30:10 +0000 (UTC) Received: (qmail 55964 invoked by uid 500); 21 Oct 2015 12:30:09 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 55922 invoked by uid 500); 21 Oct 2015 12:30:09 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 55892 invoked by uid 99); 21 Oct 2015 12:30:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Oct 2015 12:30:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7CFDCE042F; Wed, 21 Oct 2015 12:30:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Wed, 21 Oct 2015 12:30:09 -0000 Message-Id: <059c0b56da974d4fad17861526e219cd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cassandra git commit: Avoid repetition of JVM_OPTS in debian package Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 73d9a80c5 -> 8be382a7e 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-3.0 Commit: 9d8436f922ad2d4ee7edb647e2e1677c2194ad61 Parents: da8be1c Author: Sylvain Lebresne Authored: Wed Oct 21 14:26:22 2015 +0200 Committer: Sylvain Lebresne 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