Merge branch 'cassandra-3.9' of http://git-wip-us.apache.org/repos/asf/cassandra into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0702e458 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0702e458 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0702e458 Branch: refs/heads/cassandra-3.9 Commit: 0702e4580c8b51dcd2ea462de3f5fcd1e79038a5 Parents: 118f1a0 44e475c Author: Benjamin Lerer <b.le...@gmail.com> Authored: Mon Jul 4 14:35:19 2016 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Mon Jul 4 14:35:19 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0702e458/CHANGES.txt ----------------------------------------------------------------------