Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6daf1b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6daf1b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6daf1b6 Branch: refs/heads/trunk Commit: d6daf1b667b584cf30545cdb5cb3fac726a9cf4b Parents: f5ae572 415bb56 Author: Robert Stupp <sn...@snazy.de> Authored: Wed May 4 18:47:29 2016 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Wed May 4 18:47:29 2016 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
