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/4b437b4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b437b4e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b437b4e Branch: refs/heads/trunk Commit: 4b437b4e9dd8ae65fde1b6cb04a492811dd5b120 Parents: 4b477b4 878990c Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Jun 3 08:05:33 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Jun 3 08:05:33 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 5 +++++ src/java/org/apache/cassandra/streaming/StreamResultFuture.java | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b437b4e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0db4926,333606a..c7da943 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,6 +1,16 @@@ +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 * Upgrade to Pig 0.12.1 (CASSANDRA-6556) + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329) Merged from 2.0: * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)