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 A689711DEE for ; Wed, 11 Jun 2014 14:52:21 +0000 (UTC) Received: (qmail 15128 invoked by uid 500); 11 Jun 2014 14:52:16 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 15009 invoked by uid 500); 11 Jun 2014 14:52:16 -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 14993 invoked by uid 99); 11 Jun 2014 14:52:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jun 2014 14:52:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3E44E927807; Wed, 11 Jun 2014 14:52:16 +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: Wed, 11 Jun 2014 14:52:17 -0000 Message-Id: <20e484114fe04063be89eabf42dace6c@git.apache.org> In-Reply-To: <1061ab4bb4c04aae89468a996a8bb800@git.apache.org> References: <1061ab4bb4c04aae89468a996a8bb800@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/cql/AbstractModification.java src/java/org/apache/cassandra/cql/DeleteStatement.java src/java/org/apache/cassandra/cql/UpdateStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9aace483 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9aace483 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9aace483 Branch: refs/heads/trunk Commit: 9aace4836ebbb1ddd93c5c9e27e0008a70f734ea Parents: 2044424 5fe7557 Author: Aleksey Yeschenko Authored: Wed Jun 11 09:52:07 2014 -0500 Committer: Aleksey Yeschenko Committed: Wed Jun 11 09:52:07 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/cql3/UpdateParameters.java | 19 ++++++++++--- .../cql3/statements/DeleteStatement.java | 2 +- .../apache/cassandra/db/CounterMutation.java | 3 ++ .../cassandra/thrift/CassandraServer.java | 29 ++++++++++++-------- 5 files changed, 38 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aace483/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index cded133,a8a84d8..aa2f96c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -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 + * Explicitly use Long.MAX_VALUE timestamp for counter deletions + (CASSANDRA-7346) * Fix native protocol CAS batches (CASSANDRA-7337) * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359) * Upgrade to Pig 0.12.1 (CASSANDRA-6556) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aace483/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------