Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fa00679 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fa00679 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fa00679 Branch: refs/heads/trunk Commit: 2fa00679071a1489dea652c43ac84572aa1dc32f Parents: 030762a 8d87c28 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Mon Jul 20 12:52:35 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Mon Jul 20 12:52:35 2015 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fa00679/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
