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/18 19:40:49 UTC
[1/2] cassandra git commit: ninja fix typo in cassandra-env.ps1
Repository: cassandra
Updated Branches:
refs/heads/trunk 8b8fc6bad -> 4dbdefb65
ninja fix typo in cassandra-env.ps1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f50e9321
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f50e9321
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f50e9321
Branch: refs/heads/trunk
Commit: f50e9321f78a644a69383b410b165367b72435c5
Parents: ff6e3e7
Author: Joshua McKenzie <jm...@apache.org>
Authored: Tue Aug 18 13:40:25 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Tue Aug 18 13:40:25 2015 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f50e9321/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 5100577..f005ab1 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -332,7 +332,7 @@ 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))
+ if ($env:JVM_VERSION.CompareTo("1.8.0_40") -eq -1)
{
echo "Cassandra 3.0 and later require Java 8u40 or later."
exit
[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/4dbdefb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dbdefb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dbdefb6
Branch: refs/heads/trunk
Commit: 4dbdefb65ada25f1f274ff6a410cfed3941798fc
Parents: 8b8fc6b f50e932
Author: Joshua McKenzie <jm...@apache.org>
Authored: Tue Aug 18 13:40:36 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Tue Aug 18 13:40:36 2015 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------