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/12c4734b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12c4734b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12c4734b Branch: refs/heads/trunk Commit: 12c4734b5d657fec128db6cb284d03c92b2f1882 Parents: c7af304 4106f56 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Oct 3 11:10:49 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Oct 3 11:10:49 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/columniterator/IndexedSliceReader.java | 13 +- .../cassandra/db/ColumnFamilyStoreTest.java | 198 +++++++++++++++++++ 3 files changed, 209 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/12c4734b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/12c4734b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java ----------------------------------------------------------------------
