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/3c17ac6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c17ac6e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c17ac6e Branch: refs/heads/cassandra-2.1 Commit: 3c17ac6e1c3da822013c99a179e9e4030b5086f9 Parents: 7b50213 a64bc43 Author: Brandon Williams <[email protected]> Authored: Wed Apr 15 10:40:25 2015 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Apr 15 10:40:25 2015 -0500 ---------------------------------------------------------------------- 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/3c17ac6e/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
