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/358f9f3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/358f9f3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/358f9f3f Branch: refs/heads/cassandra-2.1 Commit: 358f9f3faeac155b48fb74dc92b09d303a87c015 Parents: 6e7a223 a910930 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Dec 5 21:18:50 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Dec 5 21:18:50 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/358f9f3f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
