Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13314aa2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13314aa2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13314aa2 Branch: refs/heads/cassandra-3.3 Commit: 13314aa2eb926ecba56221ad77b037fcc4d0bfe1 Parents: e07c7d0 0b479a7 Author: Sylvain Lebresne <[email protected]> Authored: Fri Jan 22 15:44:16 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Jan 22 15:44:16 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 10 ++- .../org/apache/cassandra/gms/GossiperTest.java | 93 ++++++++++++++++++++ 3 files changed, 100 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13314aa2/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13314aa2/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
