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 2016/05/03 20:08:00 UTC

[01/15] cassandra git commit: Use -lt comparator for JVM patch version

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 <ed...@datastax.com>
Authored: Tue May 3 13:55:21 2016 +0200
Committer: Josh McKenzie <jo...@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


[07/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by jm...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: 8bf453a4491c766ec8a920a12f8a87111a7546e4
Parents: d3db33c 5202147
Author: Josh McKenzie <jo...@datastax.com>
Authored: Tue May 3 14:05:23 2016 -0400
Committer: Josh McKenzie <jo...@datastax.com>
Committed: Tue May 3 14:05:23 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bf453a4/conf/cassandra-env.sh
----------------------------------------------------------------------


[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7

Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7


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

Branch: refs/heads/trunk
Commit: 54d7fc4b021a7b4b1e9db16131b815cdfea1b88f
Parents: 0095499 c7d216e
Author: Josh McKenzie <jo...@datastax.com>
Authored: Tue May 3 14:06:57 2016 -0400
Committer: Josh McKenzie <jo...@datastax.com>
Committed: Tue May 3 14:06:57 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/54d7fc4b/conf/cassandra-env.sh
----------------------------------------------------------------------


[13/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7

Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7


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

Branch: refs/heads/cassandra-3.7
Commit: 54d7fc4b021a7b4b1e9db16131b815cdfea1b88f
Parents: 0095499 c7d216e
Author: Josh McKenzie <jo...@datastax.com>
Authored: Tue May 3 14:06:57 2016 -0400
Committer: Josh McKenzie <jo...@datastax.com>
Committed: Tue May 3 14:06:57 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/54d7fc4b/conf/cassandra-env.sh
----------------------------------------------------------------------


[05/15] cassandra git commit: Use -lt comparator for JVM patch version

Posted by jm...@apache.org.
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-3.7
Commit: 5202147d9f4077afe6ac185654fa153c7fbd6f95
Parents: 86c5a00
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Tue May 3 13:55:21 2016 +0200
Committer: Josh McKenzie <jo...@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


[08/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by jm...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 8bf453a4491c766ec8a920a12f8a87111a7546e4
Parents: d3db33c 5202147
Author: Josh McKenzie <jo...@datastax.com>
Authored: Tue May 3 14:05:23 2016 -0400
Committer: Josh McKenzie <jo...@datastax.com>
Committed: Tue May 3 14:05:23 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bf453a4/conf/cassandra-env.sh
----------------------------------------------------------------------


[02/15] cassandra git commit: Use -lt comparator for JVM patch version

Posted by jm...@apache.org.
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.2
Commit: 5202147d9f4077afe6ac185654fa153c7fbd6f95
Parents: 86c5a00
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Tue May 3 13:55:21 2016 +0200
Committer: Josh McKenzie <jo...@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


[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by jm...@apache.org.
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/cassandra-3.7
Commit: c7d216e3fe86535948d521aa96db3bdac56cfafc
Parents: 5244787 8bf453a
Author: Josh McKenzie <jo...@datastax.com>
Authored: Tue May 3 14:06:03 2016 -0400
Committer: Josh McKenzie <jo...@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
  


[15/15] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

Posted by jm...@apache.org.
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: 17d30c9e52693e3f9dee3f07fb8838273dd25daf
Parents: b0806f8 54d7fc4
Author: Josh McKenzie <jo...@datastax.com>
Authored: Tue May 3 14:07:12 2016 -0400
Committer: Josh McKenzie <jo...@datastax.com>
Committed: Tue May 3 14:07:12 2016 -0400

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



[10/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by jm...@apache.org.
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 <jo...@datastax.com>
Authored: Tue May 3 14:06:03 2016 -0400
Committer: Josh McKenzie <jo...@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
  


[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by jm...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 8bf453a4491c766ec8a920a12f8a87111a7546e4
Parents: d3db33c 5202147
Author: Josh McKenzie <jo...@datastax.com>
Authored: Tue May 3 14:05:23 2016 -0400
Committer: Josh McKenzie <jo...@datastax.com>
Committed: Tue May 3 14:05:23 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bf453a4/conf/cassandra-env.sh
----------------------------------------------------------------------


[03/15] cassandra git commit: Use -lt comparator for JVM patch version

Posted by jm...@apache.org.
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/trunk
Commit: 5202147d9f4077afe6ac185654fa153c7fbd6f95
Parents: 86c5a00
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Tue May 3 13:55:21 2016 +0200
Committer: Josh McKenzie <jo...@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


[12/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by jm...@apache.org.
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/cassandra-3.0
Commit: c7d216e3fe86535948d521aa96db3bdac56cfafc
Parents: 5244787 8bf453a
Author: Josh McKenzie <jo...@datastax.com>
Authored: Tue May 3 14:06:03 2016 -0400
Committer: Josh McKenzie <jo...@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
  


[09/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by jm...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.7
Commit: 8bf453a4491c766ec8a920a12f8a87111a7546e4
Parents: d3db33c 5202147
Author: Josh McKenzie <jo...@datastax.com>
Authored: Tue May 3 14:05:23 2016 -0400
Committer: Josh McKenzie <jo...@datastax.com>
Committed: Tue May 3 14:05:23 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bf453a4/conf/cassandra-env.sh
----------------------------------------------------------------------


[04/15] cassandra git commit: Use -lt comparator for JVM patch version

Posted by jm...@apache.org.
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-3.0
Commit: 5202147d9f4077afe6ac185654fa153c7fbd6f95
Parents: 86c5a00
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Tue May 3 13:55:21 2016 +0200
Committer: Josh McKenzie <jo...@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