Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f505e8bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f505e8bd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f505e8bd Branch: refs/heads/trunk Commit: f505e8bdfe1edc13a3dbdb60ccf5d8bc9b710cd3 Parents: 468a4c5 87f5e2e Author: Yuki Morishita <[email protected]> Authored: Tue Nov 3 10:03:40 2015 -0600 Committer: Yuki Morishita <[email protected]> Committed: Tue Nov 3 10:03:40 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/streaming/StreamReader.java | 12 ++++++++---- .../streaming/compress/CompressedStreamReader.java | 11 ++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f505e8bd/CHANGES.txt ----------------------------------------------------------------------
