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/944c1716 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/944c1716 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/944c1716 Branch: refs/heads/trunk Commit: 944c1716d68635554cf7fa773c1a7bd58bb6ba59 Parents: 2941791 d483359 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Mon Jun 23 16:54:38 2014 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Mon Jun 23 16:54:38 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/cql3/ColumnIdentifier.java | 2 +- .../apache/cassandra/db/AtomicBTreeColumns.java | 4 ++-- .../org/apache/cassandra/db/BufferCell.java | 4 ++-- src/java/org/apache/cassandra/db/Cell.java | 2 +- .../org/apache/cassandra/db/NativeCell.java | 2 +- .../apache/cassandra/db/NativeCounterCell.java | 2 +- .../apache/cassandra/db/NativeDeletedCell.java | 2 +- .../apache/cassandra/db/NativeExpiringCell.java | 2 +- .../org/apache/cassandra/db/RowIndexEntry.java | 2 +- .../cassandra/db/composites/CellName.java | 2 +- .../db/composites/CompoundComposite.java | 8 +++---- .../db/composites/CompoundDenseCellName.java | 2 +- .../db/composites/CompoundSparseCellName.java | 22 ++++++++++++++++---- .../db/composites/SimpleDenseCellName.java | 2 +- .../db/composites/SimpleSparseCellName.java | 4 ++-- .../SimpleSparseInternedCellName.java | 2 +- .../cassandra/io/sstable/IndexHelper.java | 2 +- 18 files changed, 42 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/944c1716/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index aea3cf6,04b148c..ffc12f3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,19 @@@ +3.0 + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7208) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + + + 2.1.0-rc2 + * Fix heap size calculation for CompoundSparseCellName and + CompoundSparseCellName.WithCollection (CASSANDRA-7421) * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351) * Modify reconcile logic to always pick a tombstone over a counter cell (CASSANDRA-7346) http://git-wip-us.apache.org/repos/asf/cassandra/blob/944c1716/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java ----------------------------------------------------------------------
