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 CE04418F18 for ; Tue, 15 Sep 2015 17:27:26 +0000 (UTC) Received: (qmail 42780 invoked by uid 500); 15 Sep 2015 17:27:26 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 42498 invoked by uid 500); 15 Sep 2015 17:27:26 -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 42483 invoked by uid 99); 15 Sep 2015 17:27:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Sep 2015 17:27:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6B043DFBAD; Tue, 15 Sep 2015 17:27:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Tue, 15 Sep 2015 17:27:27 -0000 Message-Id: <9a1fd1772b2d4015a28e9ce322d10422@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d3617dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d3617dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d3617dd Branch: refs/heads/trunk Commit: 6d3617dd5eaf3406c8339bf1ead57c009cbf2575 Parents: 7a0698e b454484 Author: T Jake Luciani Authored: Tue Sep 15 13:27:10 2015 -0400 Committer: T Jake Luciani Committed: Tue Sep 15 13:27:10 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d3617dd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 226f1a1,36ae689..f817f4f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ +3.2 + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0.0-rc1 + * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318) * Give index implementations more control over rebuild operations (CASSANDRA-10312) * Update index file format (CASSANDRA-10314) * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261)