Updated Branches: refs/heads/cassandra-1.1 fe980034e -> 0e2706a7f refs/heads/trunk 02a302a93 -> 1a362131a
Merge branch 'cassandra-1.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/1a362131 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a362131 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a362131 Branch: refs/heads/trunk Commit: 1a362131a64c0b70c9847787723e139ca594afba Parents: 02a302a 0e2706a Author: Jonathan Ellis <[email protected]> Authored: Mon Mar 19 10:18:31 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Mar 19 10:18:31 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 - .../db/index/MultiRowIndexSearcherIterator.java | 225 --------------- .../cassandra/db/index/keys/KeysSearcher.java | 136 ++++++++-- 3 files changed, 115 insertions(+), 247 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a362131/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a362131/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java ----------------------------------------------------------------------
