Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd74a6d0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd74a6d0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd74a6d0 Branch: refs/heads/trunk Commit: cd74a6d0d795bb9240d2423a28157c090688df3d Parents: 9e2eca3 db3935e Author: Yuki Morishita <[email protected]> Authored: Tue Apr 8 13:04:32 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Tue Apr 8 13:04:32 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +- src/java/org/apache/cassandra/streaming/StreamSession.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
