Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c122037 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c122037 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c122037 Branch: refs/heads/trunk Commit: 5c122037931c898f1b96b49a95df89f085d52414 Parents: 149d151 dfa6b98 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Aug 1 10:47:57 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Aug 1 10:47:57 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 13 +++++++ .../cassandra/config/DatabaseDescriptor.java | 2 +- .../cassandra/locator/SimpleSeedProvider.java | 36 ++++++++++++-------- 3 files changed, 35 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c122037/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c122037/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
