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/ac1a9cd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac1a9cd6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac1a9cd6 Branch: refs/heads/trunk Commit: ac1a9cd63ab06289b1bd7d8cce706a51991eef0c Parents: 17afc08 7f3d07a Author: Yuki Morishita <yu...@apache.org> Authored: Fri May 9 10:41:45 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri May 9 10:41:45 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/streaming/StreamSession.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
