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/6125b0b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6125b0b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6125b0b8 Branch: refs/heads/trunk Commit: 6125b0b8695d99bcfad3bf631a8d023d033bf2ea Parents: 4329238 cd9e463 Author: Dave Brosius <[email protected]> Authored: Fri Jun 6 00:02:32 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri Jun 6 00:02:32 2014 -0400 ---------------------------------------------------------------------- .../cassandra/streaming/compress/CompressedStreamReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
