Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/816c2b3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/816c2b3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/816c2b3f Branch: refs/heads/trunk Commit: 816c2b3f777843279295e67b0906f3df92ccc84a Parents: aa133b7 59b8e17 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue May 19 10:33:06 2015 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue May 19 10:33:06 2015 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/streaming/ConnectionHandler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/816c2b3f/src/java/org/apache/cassandra/streaming/ConnectionHandler.java ----------------------------------------------------------------------
