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/ff5134ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff5134ad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff5134ad Branch: refs/heads/trunk Commit: ff5134ad035d05e4172ea72876599132730066a0 Parents: aaf890c 336a665 Author: Jonathan Ellis <[email protected]> Authored: Fri Feb 28 14:45:30 2014 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Feb 28 14:45:30 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
