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/83d15631 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83d15631 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83d15631 Branch: refs/heads/cassandra-2.1 Commit: 83d15631f09da9cdd8d57b422ee9842ad9e5ba74 Parents: 7c34d8b 05920cb Author: Brandon Williams <[email protected]> Authored: Wed Sep 17 14:07:18 2014 +0000 Committer: Brandon Williams <[email protected]> Committed: Wed Sep 17 14:07:18 2014 +0000 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83d15631/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
