cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [01/15] cassandra git commit: Use -lt comparator for JVM patch version
Date Tue, 03 May 2016 18:08:00 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 86c5a00c2 -> 5202147d9
  refs/heads/cassandra-2.2 d3db33c00 -> 8bf453a44
  refs/heads/cassandra-3.0 52447873a -> c7d216e3f
  refs/heads/cassandra-3.7 009549927 -> 54d7fc4b0
  refs/heads/trunk b0806f8f1 -> 17d30c9e5


Use -lt comparator for JVM patch version

Patch by etudenhoefner; reviewed by mshuler for CASSANDRA-11661


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5202147d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5202147d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5202147d

Branch: refs/heads/cassandra-2.1
Commit: 5202147d9f4077afe6ac185654fa153c7fbd6f95
Parents: 86c5a00
Author: Eduard Tudenhoefner <eduard.tudenhoefner@datastax.com>
Authored: Tue May 3 13:55:21 2016 +0200
Committer: Josh McKenzie <josh.mckenzie@datastax.com>
Committed: Tue May 3 14:04:16 2016 -0400

----------------------------------------------------------------------
 conf/cassandra-env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5202147d/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index eccea48..13e9cc7 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -99,7 +99,7 @@ if [ "$JVM_VERSION" \< "1.7" ] ; then
     exit 1;
 fi
 
-if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" \< "25" ] ; then
+if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt 25 ] ; then
     echo "Cassandra 2.0 and later require Java 7u25 or later."
     exit 1;
 fi


Mime
View raw message