Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78dcf79c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78dcf79c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78dcf79c Branch: refs/heads/trunk Commit: 78dcf79c7086643272c1ba1ceed6cae54000f06d Parents: 1b60ffd 9c02625 Author: Marcus Eriksson <[email protected]> Authored: Tue Sep 1 16:30:24 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Tue Sep 1 16:30:24 2015 +0200 ---------------------------------------------------------------------- .../cassandra/index/SecondaryIndexManager.java | 56 ++++++++++---------- 1 file changed, 27 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
