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/d4ac8d59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4ac8d59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4ac8d59 Branch: refs/heads/cassandra-2.1 Commit: d4ac8d59b028895daab8b4e549a3d2ffdc033f3e Parents: 69abfaa 579222e Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Aug 19 16:19:54 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Aug 19 16:19:54 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../db/index/SecondaryIndexManager.java | 28 +++++++++----------- 2 files changed, 13 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4ac8d59/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4ac8d59/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ----------------------------------------------------------------------
