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/db3935e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db3935e4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db3935e4 Branch: refs/heads/cassandra-2.1 Commit: db3935e4c45de2ef2caf23d25088173dfe3dc5d8 Parents: 0fa5cba c6ec5d5 Author: Yuki Morishita <[email protected]> Authored: Tue Apr 8 13:01:02 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Tue Apr 8 13:01:02 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db3935e4/src/java/org/apache/cassandra/streaming/ConnectionHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db3935e4/src/java/org/apache/cassandra/streaming/StreamSession.java ----------------------------------------------------------------------
