Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7dcbd64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7dcbd64 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7dcbd64 Branch: refs/heads/trunk Commit: e7dcbd64a88fdb8852a24847e83df0342d396bea Parents: 29bd15e 5e111e6 Author: Aleksey Yeschenko <[email protected]> Authored: Thu Jul 21 15:03:55 2016 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Jul 21 15:03:55 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7dcbd64/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7dcbd64/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
