Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bc0db04 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0bc0db04 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0bc0db04 Branch: refs/heads/cassandra-2.1 Commit: 0bc0db04959f7a7721dd10a237c3afc65491e757 Parents: 48c9db6 922f5af Author: Aleksey Yeschenko <[email protected]> Authored: Thu Mar 20 16:49:36 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Mar 20 16:49:36 2014 +0300 ---------------------------------------------------------------------- .../cassandra/db/index/SecondaryIndexManager.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0bc0db04/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ----------------------------------------------------------------------
