Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/gms/Gossiper.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bef7146c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bef7146c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bef7146c
Branch: refs/heads/trunk
Commit: bef7146c73ff986f01da8b8674b2f860d0e5e201
Parents: db07b20 4be6200
Author: Brandon Williams <[email protected]>
Authored: Thu Jan 9 17:00:39 2014 -0600
Committer: Brandon Williams <[email protected]>
Committed: Thu Jan 9 17:00:39 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 37 +++++++++++++-------
1 file changed, 24 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bef7146c/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
