This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 50d8245d76aa76747f8bd6ae3947d22e5a02d290
Merge: 8ffa79f 17ebee3
Author: David Capwell <dcapw...@apache.org>
AuthorDate: Fri Nov 13 12:36:31 2020 -0800

    Merge branch 'cassandra-3.0' into cassandra-3.11

 src/java/org/apache/cassandra/service/StorageService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 734f176,a72b530..eb13df1
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -149,7 -143,7 +149,7 @@@ public class StorageService extends Not
          String newdelay = System.getProperty("cassandra.schema_delay_ms");
          if (newdelay != null)
          {
--            logger.info("Overriding SCHEMA_DELAY to {}ms", newdelay);
++            logger.info("Overriding SCHEMA_DELAY_MILLIS to {}ms", newdelay);
              return Integer.parseInt(newdelay);
          }
          else


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

Reply via email to