Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: debian/init
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4dc3a6e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dc3a6e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dc3a6e3 Branch: refs/heads/cassandra-2.1 Commit: 4dc3a6e38ca4a4bc726e1ff4edcdd8f41c2e3fdd Parents: 86e3012 6b76975 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Aug 26 10:39:59 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Aug 26 10:39:59 2014 -0500 ---------------------------------------------------------------------- debian/init | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dc3a6e3/debian/init ---------------------------------------------------------------------- diff --cc debian/init index 4b8c2f8,3658198..00304b6 --- a/debian/init +++ b/debian/init @@@ -38,6 -38,11 +38,8 @@@ if [ -z "$JVM_OPTS" ]; the exit 3 fi -# Add JNA to EXTRA_CLASSPATH -export EXTRA_CLASSPATH="/usr/share/java/jna.jar:$EXTRA_CLASSPATH" - + export JVM_OPTS + # Export JAVA_HOME, if set. [ -n "$JAVA_HOME" ] && export JAVA_HOME