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/e5f66507 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5f66507 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5f66507 Branch: refs/heads/trunk Commit: e5f66507ee5b47b4ea90e465a0ac5de717afd9b0 Parents: 17c7e94 58eebc9 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Oct 1 09:02:05 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Oct 1 09:02:05 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../CompositesIndexOnClusteringKey.java | 3 +- .../CompositesIndexOnPartitionKey.java | 4 +- .../db/index/composites/CompositesSearcher.java | 2 +- .../unit/org/apache/cassandra/SchemaLoader.java | 3 +- .../cassandra/db/ColumnFamilyStoreTest.java | 48 ++++++++++++++++++++ 6 files changed, 54 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5f66507/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5f66507/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5f66507/test/unit/org/apache/cassandra/SchemaLoader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5f66507/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java ----------------------------------------------------------------------
