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/3700e012 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3700e012 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3700e012 Branch: refs/heads/trunk Commit: 3700e0121a250ba29c0111cf99c74534a5be8830 Parents: b95fd08 cfa097c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Sep 17 23:58:20 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Sep 17 23:58:20 2013 +0300 ---------------------------------------------------------------------- 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/3700e012/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
