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 5297711783 for ; Fri, 20 Jun 2014 22:23:55 +0000 (UTC) Received: (qmail 8659 invoked by uid 500); 20 Jun 2014 22:23:55 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 8598 invoked by uid 500); 20 Jun 2014 22:23:55 -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 8375 invoked by uid 99); 20 Jun 2014 22:23:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jun 2014 22:23:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BBF61989309; Fri, 20 Jun 2014 22:23:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Fri, 20 Jun 2014 22:23:57 -0000 Message-Id: In-Reply-To: <25de5bf1389c455e85eb35fcea415b5b@git.apache.org> References: <25de5bf1389c455e85eb35fcea415b5b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Conflicts: test/unit/org/apache/cassandra/cql3/DeleteTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e88c8300 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e88c8300 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e88c8300 Branch: refs/heads/trunk Commit: e88c83006a9ff479be07f8e1bd377526a4bf8369 Parents: d2a3827 ee401cf Author: Aleksey Yeschenko Authored: Fri Jun 20 15:23:46 2014 -0700 Committer: Aleksey Yeschenko Committed: Fri Jun 20 15:23:46 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../apache/cassandra/cql3/QueryProcessor.java | 1 + .../cql3/statements/BatchStatement.java | 75 ++++++---- .../transport/messages/BatchMessage.java | 11 +- .../org/apache/cassandra/cql3/BatchTests.java | 145 +++++++++++++++++++ .../org/apache/cassandra/cql3/DeleteTest.java | 25 +++- 6 files changed, 215 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e88c8300/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f30ef3c,4f68cf7..aea3cf6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +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) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + + + 2.1.0-rc2 + * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351) * Modify reconcile logic to always pick a tombstone over a counter cell (CASSANDRA-7346) * Avoid incremental compaction on Windows (CASSANDRA-7365) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e88c8300/src/java/org/apache/cassandra/cql3/QueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e88c8300/src/java/org/apache/cassandra/transport/messages/BatchMessage.java ----------------------------------------------------------------------