natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1.0 

Conflicts:
	debian/init
This commit is contained in:
Brandon Williams 2014-08-26 10:39:59 -05:00
parent 86e3012633 6b7697589d
commit 4dc3a6e38c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/init vendored
View File

@ -38,6 +38,8 @@ if [ -z "$JVM_OPTS" ]; then
exit 3
fi
export JVM_OPTS
# Export JAVA_HOME, if set.
[ -n "$JAVA_HOME" ] && export JAVA_HOME