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/9ffb1956 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ffb1956 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ffb1956 Branch: refs/heads/trunk Commit: 9ffb195697c80e71a16fd7b5ca6672f32b18b658 Parents: d6eb9e8 39b0d0e Author: Brandon Williams <[email protected]> Authored: Wed May 7 18:11:56 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed May 7 18:11:56 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
