Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a911893f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a911893f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a911893f Branch: refs/heads/trunk Commit: a911893f6e75e339bbe73efe2180ef2775ba70e6 Parents: 5b88a0f 615612f Author: Aleksey Yeschenko <[email protected]> Authored: Tue Mar 18 15:25:53 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Mar 18 15:25:53 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Keyspace.java | 2 +- .../db/index/SecondaryIndexManager.java | 85 ++++++++++++-------- 3 files changed, 53 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a911893f/CHANGES.txt ----------------------------------------------------------------------
