Merge branch 'cassandra-2.1.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/0c2bbefa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c2bbefa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c2bbefa Branch: refs/heads/trunk Commit: 0c2bbefae3186f600cef49e1859c9e56751f3ab5 Parents: e682ffc d8eff03 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Aug 7 18:36:13 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Aug 7 18:36:13 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/index/AbstractSimplePerColumnSecondaryIndex.java | 6 ++++++ .../org/apache/cassandra/db/index/SecondaryIndex.java | 10 ++++++++++ .../apache/cassandra/db/index/SecondaryIndexManager.java | 4 ++-- 4 files changed, 19 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c2bbefa/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c2bbefa/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ----------------------------------------------------------------------