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/e228703b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e228703b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e228703b Branch: refs/heads/trunk Commit: e228703b82f68338424afb0d30bd5f7e506f2335 Parents: 0171cd6 7f930e0 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon May 26 16:40:27 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon May 26 16:40:27 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/e228703b/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
