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/10aef4d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10aef4d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10aef4d8 Branch: refs/heads/trunk Commit: 10aef4d87ad44cd7a124b941aa4997d3372be1f3 Parents: 94c0299 0b26c77 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu May 8 16:00:28 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu May 8 16:00:28 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../cassandra/db/commitlog/CommitLog.java | 4 +- .../db/commitlog/CommitLogArchiver.java | 30 +++++++-- .../db/commitlog/CommitLogDescriptor.java | 71 ++++++++++++++++++-- .../db/commitlog/CommitLogReplayer.java | 48 +++++++------ .../db/commitlog/CommitLogSegment.java | 57 ++++++++++++---- .../db/commitlog/CommitLogSegmentManager.java | 7 +- .../apache/cassandra/utils/PureJavaCrc32.java | 17 ++++- 8 files changed, 184 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10aef4d8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7b387ac,1ebc050..7802d7b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ +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) + 2.1.0-rc1 + * Make commitlog archive+restore more robust (CASSANDRA-6974) * Fix marking commitlogsegments clean (CASSANDRA-6959) * Add snapshot "manifest" describing files included (CASSANDRA-6326) * Parallel streaming for sstableloader (CASSANDRA-3668)
