Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2088b11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2088b11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2088b11 Branch: refs/heads/cassandra-3.0 Commit: a2088b115033cc16025c06852c6cf749d1416512 Parents: 270e986 ae8baa4 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Dec 22 14:29:48 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Dec 22 14:29:48 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2088b11/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2088b11/src/java/org/apache/cassandra/streaming/StreamSession.java ----------------------------------------------------------------------
