Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f930e02 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f930e02 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f930e02 Branch: refs/heads/trunk Commit: 7f930e02798af1ba2eb57124f606c0d904396736 Parents: 39c295d ea5b624 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon May 26 16:39:50 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon May 26 16:39:50 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f930e02/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
