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/092281fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/092281fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/092281fe Branch: refs/heads/trunk Commit: 092281fee852d979fdf78c0ea9faf7cdb1a6329b Parents: 247bc2e a039b7d Author: Tyler Hobbs <[email protected]> Authored: Wed Sep 30 10:52:02 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed Sep 30 10:52:02 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/transport/Event.java | 29 +++++--- .../org/apache/cassandra/transport/Server.java | 71 +++++++++++++------- 3 files changed, 70 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/092281fe/CHANGES.txt ----------------------------------------------------------------------
