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/6e793428 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e793428 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e793428 Branch: refs/heads/trunk Commit: 6e793428078bad65c7e6abf0a1829cef7dfc3c93 Parents: 1753f37 3b299c4 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu May 8 18:00:07 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu May 8 18:00:07 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/commitlog/CommitLogSegment.java | 4 ++-- src/java/org/apache/cassandra/db/marshal/ListType.java | 9 +++++---- src/java/org/apache/cassandra/db/marshal/MapType.java | 13 +++++++------ .../cassandra/serializers/CollectionSerializer.java | 4 ++-- .../cassandra/db/marshal/CollectionTypeTest.java | 12 ++++++------ 6 files changed, 23 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e793428/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index facda1a,5afe800..23db712 --- 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 + * Fix marking commitlogsegments clean (CASSANDRA-6959) * Add snapshot "manifest" describing files included (CASSANDRA-6326) * Parallel streaming for sstableloader (CASSANDRA-3668) * Fix bugs in supercolumns handling (CASSANDRA-7138)
