Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0DA671176E for ; Thu, 12 Jun 2014 19:58:31 +0000 (UTC) Received: (qmail 74261 invoked by uid 500); 12 Jun 2014 19:58:30 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 74159 invoked by uid 500); 12 Jun 2014 19:58:30 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 73995 invoked by uid 99); 12 Jun 2014 19:58:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jun 2014 19:58:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6D3CF8C3530; Thu, 12 Jun 2014 19:58:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Thu, 12 Jun 2014 19:58:32 -0000 Message-Id: In-Reply-To: <77e50f1624aa48b5bd1409e2bc6d05dc@git.apache.org> References: <77e50f1624aa48b5bd1409e2bc6d05dc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-2.1' into trunk 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/542e71c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/542e71c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/542e71c2 Branch: refs/heads/trunk Commit: 542e71c26e2df9afa779f963939c656694e654c7 Parents: 7349ec2 61b13b0 Author: Jonathan Ellis Authored: Thu Jun 12 14:58:23 2014 -0500 Committer: Jonathan Ellis Committed: Thu Jun 12 14:58:23 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/542e71c2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3471496,199a0ea..ae8d540 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ +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 + * Avoid incremental compaction on Windows (CASSANDRA-7365) * Fix exception when querying a composite-keyed table with a collection index (CASSANDRA-7372) * Use node's host id in place of counter ids (CASSANDRA-7366)