You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2015/01/06 15:26:02 UTC
[1/3] cassandra git commit: Use lexical comparison for java revisions
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 1af8ea5ef -> e83304ddf
refs/heads/trunk dc0102a8e -> 0f024a619
Use lexical comparison for java revisions
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-8315
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e83304dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e83304dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e83304dd
Branch: refs/heads/cassandra-2.1
Commit: e83304ddfee1377417b334d393c61671895d8ed5
Parents: 1af8ea5
Author: Brandon Williams <br...@apache.org>
Authored: Tue Jan 6 08:24:48 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Jan 6 08:24:48 2015 -0600
----------------------------------------------------------------------
conf/cassandra-env.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e83304dd/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 191fb7e..755f962 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" -lt "25" ] ; then
+if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" \< "25" ] ; then
echo "Cassandra 2.0 and later require Java 7u25 or later."
exit 1;
fi
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f024a61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f024a61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f024a61
Branch: refs/heads/trunk
Commit: 0f024a6192f185b93439ae53a69ce113b363aaaa
Parents: dc0102a e83304d
Author: Brandon Williams <br...@apache.org>
Authored: Tue Jan 6 08:25:56 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Jan 6 08:25:56 2015 -0600
----------------------------------------------------------------------
conf/cassandra-env.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f024a61/conf/cassandra-env.sh
----------------------------------------------------------------------
[2/3] cassandra git commit: Use lexical comparison for java revisions
Posted by br...@apache.org.
Use lexical comparison for java revisions
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-8315
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e83304dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e83304dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e83304dd
Branch: refs/heads/trunk
Commit: e83304ddfee1377417b334d393c61671895d8ed5
Parents: 1af8ea5
Author: Brandon Williams <br...@apache.org>
Authored: Tue Jan 6 08:24:48 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Jan 6 08:24:48 2015 -0600
----------------------------------------------------------------------
conf/cassandra-env.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e83304dd/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 191fb7e..755f962 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" -lt "25" ] ; then
+if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" \< "25" ] ; then
echo "Cassandra 2.0 and later require Java 7u25 or later."
exit 1;
fi