Merge branch 'cassandra-3.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/b8a15470 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8a15470 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8a15470 Branch: refs/heads/trunk Commit: b8a1547065641a83e27c221cb5e75628b5c5a93f Parents: 3971452 6b25c58 Author: Sam Tunnicliffe <[email protected]> Authored: Thu Oct 8 10:06:32 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Thu Oct 8 10:06:32 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8a15470/CHANGES.txt ----------------------------------------------------------------------
