merge from 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14e44db0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14e44db0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14e44db0 Branch: refs/heads/trunk Commit: 14e44db00c3c9ea6791611cfcf0cd571edf63668 Parents: 05d4d3a baf1300 Author: Pavel Yaskevich <xe...@apache.org> Authored: Wed Mar 28 01:21:04 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Wed Mar 28 01:21:04 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/14e44db0/CHANGES.txt ----------------------------------------------------------------------
