Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66f0d6b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66f0d6b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66f0d6b7 Branch: refs/heads/trunk Commit: 66f0d6b7351bc2cc21a1df75c0a035a18c8720ab Parents: 0ab0db2 2993965 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Aug 1 09:35:07 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Aug 1 09:35:07 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f0d6b7/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
