Merge branch 'cassandra-2.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/35c2f928 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35c2f928 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35c2f928 Branch: refs/heads/trunk Commit: 35c2f9285f6ef310910888780dfef9908997cf7e Parents: e085e82 bbc0891 Author: Jonathan Ellis <[email protected]> Authored: Sat Dec 28 20:49:11 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Sat Dec 28 20:49:11 2013 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/io/compress/CompressionMetadata.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
