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/704469d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/704469d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/704469d9 Branch: refs/heads/trunk Commit: 704469d95f3e2842eb174d887330eea682774e4e Parents: 805a4ae 5e90091 Author: Aleksey Yeschenko <[email protected]> Authored: Tue Jun 17 17:42:59 2014 -0700 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Jun 17 17:42:59 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 4 +- .../db/index/SecondaryIndexManager.java | 28 +++++++++- .../cassandra/db/ColumnFamilyStoreTest.java | 55 ++++++++++++++++++++ 3 files changed, 85 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/704469d9/CHANGES.txt ----------------------------------------------------------------------
