Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a892dd81 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a892dd81 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a892dd81 Branch: refs/heads/trunk Commit: a892dd8129a046dc043f291101d7b965aac78398 Parents: b504535 ab6e485 Author: Yuki Morishita <[email protected]> Authored: Wed Jul 29 19:58:36 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Wed Jul 29 19:58:36 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ src/java/org/apache/cassandra/streaming/StreamSession.java | 9 ++++++--- .../org/apache/cassandra/thrift/ThriftSessionManager.java | 9 ++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a892dd81/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a892dd81/src/java/org/apache/cassandra/streaming/StreamSession.java ----------------------------------------------------------------------
