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 2FE8018B78 for ; Mon, 26 Oct 2015 12:40:22 +0000 (UTC) Received: (qmail 6587 invoked by uid 500); 26 Oct 2015 12:40:22 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 6555 invoked by uid 500); 26 Oct 2015 12:40:22 -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 6501 invoked by uid 99); 26 Oct 2015 12:40:21 -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; Mon, 26 Oct 2015 12:40:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ABC39E02FF; Mon, 26 Oct 2015 12:40:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snazy@apache.org To: commits@cassandra.apache.org Date: Mon, 26 Oct 2015 12:40:22 -0000 Message-Id: In-Reply-To: <5a158c7a5944423dafe7f7a89a74224b@git.apache.org> References: <5a158c7a5944423dafe7f7a89a74224b@git.apache.org> 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/6f848db4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f848db4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f848db4 Branch: refs/heads/trunk Commit: 6f848db4c071d89b6ee8ba54beded4274fe5347b Parents: f91aad4 db7feb4 Author: Robert Stupp Authored: Mon Oct 26 13:39:38 2015 +0100 Committer: Robert Stupp Committed: Mon Oct 26 13:39:38 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 1 + tools/bin/token-generator | 356 ------------------------------------- tools/bin/token-generator.bat | 34 ---- 4 files changed, 2 insertions(+), 390 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f848db4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2c4a145,0457917..02f6584 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.2 + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0 + * Remove token generator (CASSANDRA-5261) * RolesCache should not be created for any authenticator that does not requireAuthentication (CASSANDRA-10562) * Fix LogTransaction checking only a single directory for files (CASSANDRA-10421) * Support encrypted and plain traffic on the same port (CASSANDRA-10559)