Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b6a368c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b6a368c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b6a368c Branch: refs/heads/trunk Commit: 5b6a368c90233072c419e94bd3c3cb8c1362376e Parents: 6bda886 ccb20ad Author: Yuki Morishita <yu...@apache.org> Authored: Tue Dec 1 13:07:51 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Dec 1 13:07:51 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/streaming/StreamReceiveTask.java | 60 ++++++++++---------- 2 files changed, 31 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b6a368c/CHANGES.txt ----------------------------------------------------------------------
