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:24 UTC

[09/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

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/f64a113e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f64a113e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f64a113e

Branch: refs/heads/cassandra-2.1
Commit: f64a113e1bff705e2264ae00defdfe82ba3992c7
Parents: a4d3da3 1e0b4c5
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 14:00:11 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 14:00:11 2014 -0500

----------------------------------------------------------------------
 .../cassandra/locator/SimpleSeedProvider.java   | 27 ++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------