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/20444245 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20444245 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20444245 Branch: refs/heads/trunk Commit: 2044424524a9cba47e58ba81feab6df5d17ac995 Parents: a28f64f deaf5ba Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon Jun 9 21:42:36 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon Jun 9 21:42:36 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/20444245/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
