Updated Branches: refs/heads/trunk c3cbbe123 -> e09dd2aa6
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e09dd2aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e09dd2aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e09dd2aa Branch: refs/heads/trunk Commit: e09dd2aa6bd0d1e288178369ca685ad16d2c5a56 Parents: c3cbbe1 14e44db Author: Pavel Yaskevich <xe...@apache.org> Authored: Wed Mar 28 01:22:46 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Wed Mar 28 01:22:46 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/index/keys/KeysSearcher.java | 2 - .../apache/cassandra/db/ColumnFamilyStoreTest.java | 31 +++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e09dd2aa/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e09dd2aa/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java ----------------------------------------------------------------------