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/16069c35 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16069c35 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16069c35 Branch: refs/heads/trunk Commit: 16069c351bde3f0f418021def169a5553abe41e1 Parents: e7d6534 d4ac8d5 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Aug 19 16:20:20 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Aug 19 16:20:20 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/16069c35/CHANGES.txt ----------------------------------------------------------------------
