natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.2' into cassandra-3.0

This commit is contained in:
Joshua McKenzie 2015-08-14 11:50:40 -04:00
parent 381cf568c9 10be826e7a
commit 1288427669
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/cassandra.ps1
View File

@ -194,7 +194,6 @@ Function PrintVersion()
#-----------------------------------------------------------------------------
Function RunCassandra([string]$foreground)
{
echo "Starting cassandra server"
$cmd = @"
$env:JAVA_BIN
"@

1
conf/cassandra-env.ps1
View File

@ -268,7 +268,6 @@ Function ParseJVMInfo
#-----------------------------------------------------------------------------
Function SetCassandraEnvironment
{
echo "Setting up Cassandra environment"
if (Test-Path Env:\JAVA_HOME)
{
$env:JAVA_BIN = "$env:JAVA_HOME\bin\java.exe"