Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da414762 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da414762 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da414762 Branch: refs/heads/trunk Commit: da4147628d33b6e3dc2c43b0d3f762e7fa52c760 Parents: 187636c 0d4fdad Author: Dave Brosius <[email protected]> Authored: Thu Dec 22 20:20:58 2016 -0500 Committer: Dave Brosius <[email protected]> Committed: Thu Dec 22 20:20:58 2016 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/index/SecondaryIndexManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
