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/3d737ecb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d737ecb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d737ecb Branch: refs/heads/trunk Commit: 3d737ecbb37a0b25bb0b80dd87e07b00ca9345f2 Parents: 233cc8b 0bc0db0 Author: Aleksey Yeschenko <[email protected]> Authored: Thu Mar 20 16:50:04 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Mar 20 16:50:04 2014 +0300 ---------------------------------------------------------------------- .../cassandra/db/index/SecondaryIndexManager.java | 14 +++++++++----- .../cassandra/db/marshal/CollectionTypeTest.java | 1 - 2 files changed, 9 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
