You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/08/11 16:09:59 UTC
[1/2] cassandra git commit: Require java 8u40
Repository: cassandra
Updated Branches:
refs/heads/trunk 4a748f315 -> 894541304
Require java 8u40
Patch by pthompson; reviewed by jmckenzie for CASSANDRA-9416
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0997ad6f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0997ad6f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0997ad6f
Branch: refs/heads/trunk
Commit: 0997ad6fff9896df34ba1e3425559f689d96933b
Parents: 2a656e6
Author: Philip Thompson <pt...@gmail.com>
Authored: Tue Aug 11 10:08:27 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Tue Aug 11 10:08:27 2015 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 6 ++++++
conf/cassandra-env.sh | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0997ad6f/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 91db18b..1a43eb7 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -333,6 +333,12 @@ Function SetCassandraEnvironment
$env:JVM_OPTS = "$env:JVM_OPTS -javaagent:""$env:CASSANDRA_HOME\lib\jamm-0.3.0.jar"""
}
+ if ($env:JVM_VERSION.CompareTo("1.8.0_40" -eq -1))
+ {
+ echo "Cassandra 3.0 and later require Java 8u40 or later."
+ exit
+ }
+
# enable assertions. disabling this in production will give a modest
# performance benefit (around 5%).
$env:JVM_OPTS = "$env:JVM_OPTS -ea"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0997ad6f/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 1bb2e15..fd348fe 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -80,12 +80,12 @@ JVM_VERSION=${jvmver%_*}
JVM_PATCH_VERSION=${jvmver#*_}
if [ "$JVM_VERSION" \< "1.8" ] ; then
- echo "Cassandra 3.0 and later require Java 8u20 or later."
+ echo "Cassandra 3.0 and later require Java 8u40 or later."
exit 1;
fi
-if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" \< "20" ] ; then
- echo "Cassandra 3.0 and later require Java 8u20 or later."
+if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" \< "40" ] ; then
+ echo "Cassandra 3.0 and later require Java 8u40 or later."
exit 1;
fi
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89454130
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89454130
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89454130
Branch: refs/heads/trunk
Commit: 894541304b5b4fe0411e6d5dd8fa7f832ab24d82
Parents: 4a748f3 0997ad6
Author: Joshua McKenzie <jm...@apache.org>
Authored: Tue Aug 11 10:09:22 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Tue Aug 11 10:09:22 2015 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 6 ++++++
conf/cassandra-env.sh | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------