Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbc08912 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbc08912 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbc08912 Branch: refs/heads/cassandra-2.0 Commit: bbc089125a6031abd5fb5e1a175e1f3655a53d20 Parents: 0e0884f 3eef540 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat Dec 28 20:49:02 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sat Dec 28 20:49:02 2013 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/io/compress/CompressionMetadata.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbc08912/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java ----------------------------------------------------------------------
