Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d87c282 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d87c282 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d87c282 Branch: refs/heads/trunk Commit: 8d87c28223b92ead4758c40c3f51771cdf586d97 Parents: e651fdd b87103b Author: Benedict Elliott Smith <bened...@apache.org> Authored: Mon Jul 20 12:52:26 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Mon Jul 20 12:52:26 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/8d87c282/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
