Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/800c62f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/800c62f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/800c62f3 Branch: refs/heads/trunk Commit: 800c62f3b24c84e9cdded7630b35bffa7d665a6d Parents: b173ce2 5d67e85 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Mar 6 10:05:49 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Mar 6 10:05:49 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/composites/AbstractCellNameType.java | 10 +++-- .../cassandra/db/composites/CellName.java | 2 +- .../db/composites/CompoundDenseCellName.java | 4 +- .../db/composites/CompoundSparseCellName.java | 4 +- .../composites/CompoundSparseCellNameType.java | 2 +- .../db/composites/SimpleDenseCellName.java | 4 +- .../db/composites/SimpleSparseCellName.java | 2 +- .../db/composites/SimpleSparseCellNameType.java | 2 +- .../apache/cassandra/db/filter/ColumnSlice.java | 2 +- .../cassandra/db/ColumnFamilyStoreTest.java | 44 ++++++++++++++++++++ 11 files changed, 62 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/800c62f3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/800c62f3/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java ----------------------------------------------------------------------
