Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e5f2bd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e5f2bd6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e5f2bd6 Branch: refs/heads/trunk Commit: 3e5f2bd64eb094c9a69eb99c73318629e5102bb6 Parents: bb58d80 f40ddba Author: Dave Brosius <[email protected]> Authored: Mon Jun 9 21:41:29 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Mon Jun 9 21:41:29 2014 -0400 ---------------------------------------------------------------------- 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/3e5f2bd6/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
