Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c844bfee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c844bfee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c844bfee Branch: refs/heads/trunk Commit: c844bfeeabd252f1b9c871964bfcf3abfaf17d35 Parents: 6f55427 816c2b3 Author: Sylvain Lebresne <[email protected]> Authored: Tue May 19 10:33:25 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue May 19 10:33:25 2015 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/streaming/ConnectionHandler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
