Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5439d94c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5439d94c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5439d94c Branch: refs/heads/cassandra-3.X Commit: 5439d94c546331b30acf0d43a503e9426364e81a Parents: 838a21d 2f268ed Author: Branimir Lambov <branimir.lam...@datastax.com> Authored: Tue Dec 6 12:13:23 2016 +0200 Committer: Branimir Lambov <branimir.lam...@datastax.com> Committed: Tue Dec 6 12:14:24 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 41 ++++++++------------ .../apache/cassandra/index/CustomIndexTest.java | 37 ++++++++++++++++++ 3 files changed, 55 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5439d94c/CHANGES.txt ----------------------------------------------------------------------
