You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2017/11/02 17:47:49 UTC

[1/3] cassandra git commit: ninja-fix comment to correct the default RING_DEALY value

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 ea443dfe3 -> c8a3b58bd
  refs/heads/trunk 684e250ba -> 87962dcf3


ninja-fix comment to correct the default RING_DEALY value


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

Branch: refs/heads/cassandra-3.11
Commit: c8a3b58bdbf12909ac0a823308e8a278cd02001b
Parents: ea443df
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Nov 2 10:46:24 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Nov 2 10:46:24 2017 -0700

----------------------------------------------------------------------
 conf/jvm.options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8a3b58b/conf/jvm.options
----------------------------------------------------------------------
diff --git a/conf/jvm.options b/conf/jvm.options
index f91466a..bfe2da9 100644
--- a/conf/jvm.options
+++ b/conf/jvm.options
@@ -49,7 +49,7 @@
 # Allow restoring specific tables from an archived commit log.
 #-Dcassandra.replayList=table
 
-# Allows overriding of the default RING_DELAY (1000ms), which is the amount of time a node waits
+# Allows overriding of the default RING_DELAY (30000ms), which is the amount of time a node waits
 # before joining the ring.
 #-Dcassandra.ring_delay_ms=ms
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[2/3] cassandra git commit: ninja-fix comment to correct the default RING_DEALY value

Posted by ja...@apache.org.
ninja-fix comment to correct the default RING_DEALY value


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

Branch: refs/heads/trunk
Commit: c8a3b58bdbf12909ac0a823308e8a278cd02001b
Parents: ea443df
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Nov 2 10:46:24 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Nov 2 10:46:24 2017 -0700

----------------------------------------------------------------------
 conf/jvm.options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8a3b58b/conf/jvm.options
----------------------------------------------------------------------
diff --git a/conf/jvm.options b/conf/jvm.options
index f91466a..bfe2da9 100644
--- a/conf/jvm.options
+++ b/conf/jvm.options
@@ -49,7 +49,7 @@
 # Allow restoring specific tables from an archived commit log.
 #-Dcassandra.replayList=table
 
-# Allows overriding of the default RING_DELAY (1000ms), which is the amount of time a node waits
+# Allows overriding of the default RING_DELAY (30000ms), which is the amount of time a node waits
 # before joining the ring.
 #-Dcassandra.ring_delay_ms=ms
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

Posted by ja...@apache.org.
Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 87962dcf364944f656b5212b8418432fbd1c4b95
Parents: 684e250 c8a3b58
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Nov 2 10:46:42 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Nov 2 10:47:17 2017 -0700

----------------------------------------------------------------------
 conf/jvm.options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/87962dcf/conf/jvm.options
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org