Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/047c67ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/047c67ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/047c67ef Branch: refs/heads/cassandra-2.1 Commit: 047c67efb579607955a7637bb96ed181e7a37f56 Parents: b48d0da ea38ddc Author: Jason Brown <jasobr...@apple.com> Authored: Wed Jul 2 16:03:02 2014 -0700 Committer: Jason Brown <jasobr...@apple.com> Committed: Wed Jul 2 16:03:02 2014 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/StreamReader.java | 2 +- .../cassandra/streaming/compress/CompressedStreamReader.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
