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/2e96779d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e96779d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e96779d Branch: refs/heads/trunk Commit: 2e96779db9135d29c384c485b99caecca62545ec Parents: d0ddff1 9a0f258 Author: Yuki Morishita <[email protected]> Authored: Mon Apr 28 12:00:14 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Mon Apr 28 12:00:14 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
