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/deaf5ba1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/deaf5ba1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/deaf5ba1 Branch: refs/heads/trunk Commit: deaf5ba157d99161369a298c8fe9bc2289702f5e Parents: b16c6b9 3e5f2bd Author: Dave Brosius <[email protected]> Authored: Mon Jun 9 21:41:59 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Mon Jun 9 21:41:59 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/deaf5ba1/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
