Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7d216e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7d216e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7d216e3 Branch: refs/heads/trunk Commit: c7d216e3fe86535948d521aa96db3bdac56cfafc Parents: 5244787 8bf453a Author: Josh McKenzie <josh.mcken...@datastax.com> Authored: Tue May 3 14:06:03 2016 -0400 Committer: Josh McKenzie <josh.mcken...@datastax.com> Committed: Tue May 3 14:06:18 2016 -0400 ---------------------------------------------------------------------- conf/cassandra-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7d216e3/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --cc conf/cassandra-env.sh index 0ba0c4e,b519b76..44fe110 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@@ -97,8 -99,8 +97,8 @@@ if [ "$JVM_VERSION" \< "1.8" ] ; the exit 1; fi - if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" \< "40" ] ; then -if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt 25 ] ; then - echo "Cassandra 2.0 and later require Java 7u25 or later." ++if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt 40 ] ; then + echo "Cassandra 3.0 and later require Java 8u40 or later." exit 1; fi