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/3303e47c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3303e47c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3303e47c Branch: refs/heads/trunk Commit: 3303e47ccb3c49bcf37a2860e0910cf8a4c46407 Parents: 8540415 66c8f2b Author: Sam Tunnicliffe <s...@beobal.com> Authored: Tue May 31 09:37:27 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Tue May 31 09:37:27 2016 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3303e47c/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
