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/0afad2c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0afad2c1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0afad2c1 Branch: refs/heads/trunk Commit: 0afad2c1d7ae197b99d3103a67b6cde7c2bcf8f6 Parents: c6eaffc 0fdf2dd Author: Jonathan Ellis <[email protected]> Authored: Wed May 21 17:23:39 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed May 21 17:23:39 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + debian/cassandra.bash-completion | 1 + debian/nodetool-completion | 224 ++++++++++++++++++++++++++++++++++ debian/rules | 1 + 4 files changed, 227 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0afad2c1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6b690be,d38fe5d..f6113f7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ +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) + 2.1.0-rc1 + * Add tab-completion to debian nodetool packaging (CASSANDRA-6421) * Change concurrent_compactors defaults (CASSANDRA-7139) * Add PowerShell Windows launch scripts (CASSANDRA-7001) * Make commitlog archive+restore more robust (CASSANDRA-6974)
