Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f3d07ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f3d07ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f3d07ac Branch: refs/heads/cassandra-2.1 Commit: 7f3d07ac02178c3d3012557f4df18fe116e5ec11 Parents: 361ad68 7484bd4 Author: Yuki Morishita <yu...@apache.org> Authored: Fri May 9 10:41:36 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri May 9 10:41:36 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/streaming/StreamSession.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f3d07ac/src/java/org/apache/cassandra/streaming/StreamSession.java ----------------------------------------------------------------------
