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/46c3f7d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46c3f7d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46c3f7d8 Branch: refs/heads/trunk Commit: 46c3f7d875926d10f53cc5d05e3b0a666fda3af4 Parents: f6b424f 3c17ac6 Author: Brandon Williams <[email protected]> Authored: Wed Apr 15 10:40:36 2015 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Apr 15 10:40:36 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/46c3f7d8/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
