Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b426963e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b426963e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b426963e Branch: refs/heads/trunk Commit: b426963eb8d0570a5dc4dee201bdee2782f2d964 Parents: 3d11ec5 9ee34b6 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Mon Mar 9 12:35:34 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Mon Mar 9 12:35:34 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b426963e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
