Updated Branches: refs/heads/cassandra-1.1 25565b6bb -> 449e03719 refs/heads/cassandra-1.1.0 930721d71 -> aa7516847 refs/heads/trunk 1bd40539e -> 1c507e5f9
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c507e5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c507e5f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c507e5f Branch: refs/heads/trunk Commit: 1c507e5f94a2de1a9ad3671b0e8814bbcba71268 Parents: 1bd4053 449e037 Author: Jonathan Ellis <[email protected]> Authored: Mon Feb 27 22:55:30 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Mon Feb 27 22:55:30 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c507e5f/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 3f3779e,9ae666c..9f81d71 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -158,7 -159,7 +158,7 @@@ public class StorageService implements String newdelay = System.getProperty("cassandra.ring_delay_ms"); if (newdelay != null) { - logger.warn("Overriding RING_DELAY to {}ms", newdelay); - logger_.info("Overriding RING_DELAY to {}ms", newdelay); ++ logger.info("Overriding RING_DELAY to {}ms", newdelay); return Integer.parseInt(newdelay); } else
