Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a0f2589 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a0f2589 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a0f2589 Branch: refs/heads/trunk Commit: 9a0f25890d3a7499b29d1e2e659effaf90ec5e24 Parents: c8dcc75 9002e76 Author: Yuki Morishita <yu...@apache.org> Authored: Mon Apr 28 11:59:52 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon Apr 28 11:59:52 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a0f2589/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
