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 2014/08/11 23:37:23 UTC
[08/50] [abbrv] git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e0b4c5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e0b4c5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e0b4c5e
Branch: refs/heads/cassandra-2.1
Commit: 1e0b4c5e9618e740803a1653c51a82b78df7808c
Parents: b4741d0 d5d1adb
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 13:59:56 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 13:59:56 2014 -0500
----------------------------------------------------------------------
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 5 ++++
.../cassandra/locator/SimpleSeedProvider.java | 27 ++++++++++++++++----
2 files changed, 27 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e0b4c5e/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
index 6f36cd0,eda9fff..8e7d9fc
--- a/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
+++ b/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
@@@ -63,9 -80,9 +80,9 @@@ public class SimpleSeedProvider impleme
catch (UnknownHostException ex)
{
// not fatal... DD will bark if there end up being zero seeds.
- logger.warn("Seed provider couldn't lookup host " + host);
+ logger.warn("Seed provider couldn't lookup host {}", host);
}
}
- return Collections.unmodifiableList(seeds);
+ return seeds;
}
}