Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36610aaf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36610aaf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36610aaf Branch: refs/heads/trunk Commit: 36610aaf7e99348cae0a989cb28aa8caaa871848 Parents: 4f5242c 096f2bf Author: Aleksey Yeschenko <[email protected]> Authored: Tue Sep 10 17:58:51 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Sep 10 17:58:51 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../db/index/composites/CompositesSearcher.java | 26 +++++++++----------- 3 files changed, 14 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36610aaf/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36610aaf/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36610aaf/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java ----------------------------------------------------------------------
