Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb102da9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb102da9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb102da9 Branch: refs/heads/cassandra-3.0 Commit: cb102da9e1ca9899e7e1f0808cb418425d2c7448 Parents: ed424bd 73a730f Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Nov 13 09:57:55 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Nov 13 09:57:55 2015 -0500 ---------------------------------------------------------------------- .../apache/cassandra/io/compress/CompressionMetadata.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb102da9/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java ----------------------------------------------------------------------
