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/7000efa2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7000efa2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7000efa2 Branch: refs/heads/trunk Commit: 7000efa2141c02bc3ab5959ef676cb21d7bf58e6 Parents: ca9c4b4 fccc123 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Apr 25 22:56:40 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Apr 25 22:56:40 2014 -0400 ---------------------------------------------------------------------- .../io/compress/CompressionMetadata.java | 23 ++++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
