Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c158efdf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c158efdf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c158efdf
Branch: refs/heads/trunk
Commit: c158efdf6e3c0cb35321be01c3774e5e2b609f6c
Parents: 7036e39 cc79fe1
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Aug 20 10:10:01 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Aug 20 10:10:01 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/streaming/StreamReceiveTask.java | 56 ++++++++++++--------
2 files changed, 35 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c158efdf/CHANGES.txt
----------------------------------------------------------------------
