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/b7082df2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7082df2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7082df2 Branch: refs/heads/trunk Commit: b7082df2751c169d5579546823b330e6721555af Parents: d4a8a81 358f9f3 Author: Dave Brosius <[email protected]> Authored: Fri Dec 5 21:19:21 2014 -0500 Committer: Dave Brosius <[email protected]> Committed: Fri Dec 5 21:19:21 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7082df2/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
