Merge branch 'cassandra-2.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/2a59f815 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a59f815 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a59f815 Branch: refs/heads/trunk Commit: 2a59f815e4380ce713484b676ecb72a4778aa4ed Parents: 0ef0394 7e49ed3 Author: Yuki Morishita <[email protected]> Authored: Fri Sep 19 17:13:23 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Fri Sep 19 17:13:23 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/streaming/StreamReader.java | 5 +++++ .../org/apache/cassandra/streaming/StreamReceiveTask.java | 8 ++++++++ .../cassandra/streaming/compress/CompressedStreamReader.java | 5 +++++ 4 files changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a59f815/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a59f815/src/java/org/apache/cassandra/streaming/StreamReader.java ----------------------------------------------------------------------
