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/f7884c50
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7884c50
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7884c50

Branch: refs/heads/trunk
Commit: f7884c50e81f1c52ca46fd87cf18ddc0de71a33c
Parents: 4f2c372 84b2846
Author: Brandon Williams <[email protected]>
Authored: Wed Apr 15 09:35:48 2015 -0500
Committer: Brandon Williams <[email protected]>
Committed: Wed Apr 15 09:35:48 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/Gossiper.java | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7884c50/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------

Reply via email to