Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e202d47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e202d47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e202d47 Branch: refs/heads/cassandra-3.0 Commit: 2e202d47d34a3a0b91670b7fe7bf0e1e35d20b1b Parents: 7480202 3d73282 Author: Robert Stupp <sn...@snazy.de> Authored: Wed May 4 18:44:52 2016 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Wed May 4 18:44:52 2016 +0200 ---------------------------------------------------------------------- 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/2e202d47/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
