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/d1e41c01 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1e41c01 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1e41c01 Branch: refs/heads/trunk Commit: d1e41c01eeebe9c8cf034e42d41e94dcc2265d49 Parents: 56141ae 0c2bbef Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Aug 7 18:36:33 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Aug 7 18:36:33 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/d1e41c01/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1e41c01/src/java/org/apache/cassandra/db/index/SecondaryIndex.java ----------------------------------------------------------------------
