Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03863ed2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03863ed2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03863ed2 Branch: refs/heads/trunk Commit: 03863ed2459c1c98361b500f0f24066b3c3bcc3f Parents: 5daf8d0 5b6a368 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Dec 1 13:08:01 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Dec 1 13:08:01 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/03863ed2/CHANGES.txt ----------------------------------------------------------------------