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/47cda388 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47cda388 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47cda388 Branch: refs/heads/trunk Commit: 47cda388f57531c3f9801ff22f8541ee64ce6bb5 Parents: 134c2e9 83d1563 Author: Brandon Williams <[email protected]> Authored: Wed Sep 17 14:07:25 2014 +0000 Committer: Brandon Williams <[email protected]> Committed: Wed Sep 17 14:07:25 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/47cda388/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
