Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra 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/5f2e2205 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f2e2205 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f2e2205 Branch: refs/heads/cassandra-2.1 Commit: 5f2e220556663bd1f8cc6ff9837b93802a3968c8 Parents: cbf304e 0bc0db0 Author: Sylvain Lebresne <[email protected]> Authored: Thu Mar 20 18:24:06 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Mar 20 18:24:06 2014 +0100 ---------------------------------------------------------------------- .../cassandra/db/index/SecondaryIndexManager.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
