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.2' into cassandra-3.0 

Conflicts:
	CHANGES.txt
This commit is contained in:
Sylvain Lebresne 2015-10-21 14:29:58 +02:00
parent 73d9a80c56 d3085b1baa
commit 8be382a7ed
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -4,6 +4,8 @@ Merged from 2.2:
* Expose phi values from failure detector via JMX and tweak debug * Expose phi values from failure detector via JMX and tweak debug
and trace logging (CASSANDRA-9526) and trace logging (CASSANDRA-9526)
Merged from 2.1: Merged from 2.1:
* 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) * Fix paging issues with partitions containing only static columns data (CASSANDRA-10381)
* Fix conditions on static columns (CASSANDRA-10264) * Fix conditions on static columns (CASSANDRA-10264)
* AssertionError: attempted to delete non-existing file CommitLog (CASSANDRA-10377) * AssertionError: attempted to delete non-existing file CommitLog (CASSANDRA-10377)

10
debian/init vendored
View File

@ -31,16 +31,6 @@ FD_LIMIT=100000
# Read configuration variable file if it is present # Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME [ -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. # Export JAVA_HOME, if set.
[ -n "$JAVA_HOME" ] && export JAVA_HOME [ -n "$JAVA_HOME" ] && export JAVA_HOME