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/c58b2b28 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c58b2b28 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c58b2b28 Branch: refs/heads/trunk Commit: c58b2b28e728c071ac5741b0275638a413124721 Parents: 89463a5 047c67e Author: Jason Brown <[email protected]> Authored: Wed Jul 2 16:03:31 2014 -0700 Committer: Jason Brown <[email protected]> Committed: Wed Jul 2 16:03:31 2014 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/StreamReader.java | 2 +- .../cassandra/streaming/compress/CompressedStreamReader.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c58b2b28/src/java/org/apache/cassandra/streaming/StreamReader.java ----------------------------------------------------------------------
