Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Jason Brown 2017-11-02 10:46:42 -07:00
commit 87962dcf36
1 changed files with 1 additions and 1 deletions

View File

@ -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