Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f07aa399 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f07aa399 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f07aa399 Branch: refs/heads/trunk Commit: f07aa39992db8621cca987ea550c056affda2c76 Parents: e3d1e38 8b8c159 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jan 13 09:15:19 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jan 13 09:15:19 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f07aa399/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
