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 942291128D for ; Thu, 14 Aug 2014 21:33:52 +0000 (UTC) Received: (qmail 73532 invoked by uid 500); 14 Aug 2014 21:33:52 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 73471 invoked by uid 500); 14 Aug 2014 21:33:52 -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 73295 invoked by uid 99); 14 Aug 2014 21:33:52 -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, 14 Aug 2014 21:33:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F37989C3DF9; Thu, 14 Aug 2014 21:33:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mishail@apache.org To: commits@cassandra.apache.org Date: Thu, 14 Aug 2014 21:33:53 -0000 Message-Id: <9a72767c4b0f4f508334ba25d0caa9ce@git.apache.org> In-Reply-To: <07eccdfef83c4fbdb10fcc7c09a56829@git.apache.org> References: <07eccdfef83c4fbdb10fcc7c09a56829@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/edb5f088 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edb5f088 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edb5f088 Branch: refs/heads/trunk Commit: edb5f0883370a718816272e45695f31651751885 Parents: a712cd1 91e63d0 Author: Mikhail Stepura Authored: Thu Aug 14 14:33:17 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 14:33:17 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edb5f088/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2c6f8a4,e48117a..816640e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,5 +1,22 @@@ +3.0 + * Support pure user-defined functions (CASSANDRA-7395) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * 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-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * (cqlsh) Error when tracing query (CASSANDRA-7613) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) * SSTableExport uses correct validator to create string representation of partition keys (CASSANDRA-7498)