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/14 17:51:19 UTC

[1/2] cassandra git commit: ninja remove unnecessary prints from Windows startup scripts

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 381cf568c -> 128842766


ninja remove unnecessary prints from Windows startup scripts


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

Branch: refs/heads/cassandra-3.0
Commit: 10be826e7a44caf5e565fbf4bb2b51bded94af73
Parents: da3a5a7
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Aug 14 11:49:32 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Aug 14 11:49:32 2015 -0400

----------------------------------------------------------------------
 bin/cassandra.ps1      | 1 -
 conf/cassandra-env.ps1 | 1 -
 2 files changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/10be826e/bin/cassandra.ps1
----------------------------------------------------------------------
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 41ea7c1..b841841 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -194,7 +194,6 @@ Function PrintVersion()
 #-----------------------------------------------------------------------------
 Function RunCassandra([string]$foreground)
 {
-    echo "Starting cassandra server"
     $cmd = @"
 $env:JAVA_BIN
 "@

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10be826e/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 8b0b775..ad2392e 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -288,7 +288,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"


[2/2] 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/12884276
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12884276
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12884276

Branch: refs/heads/cassandra-3.0
Commit: 12884276699681e2950529418e45e51f73282d1b
Parents: 381cf56 10be826
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Aug 14 11:50:40 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Aug 14 11:50:40 2015 -0400

----------------------------------------------------------------------
 bin/cassandra.ps1      | 1 -
 conf/cassandra-env.ps1 | 1 -
 2 files changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/12884276/conf/cassandra-env.ps1
----------------------------------------------------------------------