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 9B28F19B37 for ; Wed, 16 Mar 2016 17:27:25 +0000 (UTC) Received: (qmail 9430 invoked by uid 500); 16 Mar 2016 17:27:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 9394 invoked by uid 500); 16 Mar 2016 17:27:25 -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 9373 invoked by uid 99); 16 Mar 2016 17:27:25 -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; Wed, 16 Mar 2016 17:27:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E999DDFCDF; Wed, 16 Mar 2016 17:27:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Date: Wed, 16 Mar 2016 17:27:27 -0000 Message-Id: <02e535dcf1bb4b9185fc79e4a8d0ae65@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cassandra git commit: Merge branch cassandra-3.5 into trunk Merge branch cassandra-3.5 into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5394f19 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5394f19 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5394f19 Branch: refs/heads/trunk Commit: e5394f192e882a5f23527041a9a93f82e80c0a49 Parents: 4ecd854 ee40e3b Author: Benjamin Lerer Authored: Wed Mar 16 18:26:48 2016 +0100 Committer: Benjamin Lerer Committed: Wed Mar 16 18:26:57 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/commitlog/AbstractCommitLogService.java | 1 + .../db/commitlog/CommitLogSegment.java | 23 +++-- .../db/commitlog/CommitLogSegmentManager.java | 11 +- .../db/commitlog/CompressedSegment.java | 4 +- .../db/commitlog/EncryptedSegment.java | 4 +- .../db/commitlog/FileDirectSegment.java | 42 ++++++-- .../commitlog/CommitLogSegmentManagerTest.java | 100 ++++++++++++++++++ .../cassandra/db/commitlog/CommitLogTest.java | 101 ++++++++++--------- 9 files changed, 220 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5394f19/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6897d61,ffd0b24..8eb0c1f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,6 +1,16 @@@ +3.6 + * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099) + * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274) + * Refuse to start and print txn log information in case of disk + corruption (CASSANDRA-10112) + * Resolve some eclipse-warnings (CASSANDRA-11086) + * (cqlsh) Show static columns in a different color (CASSANDRA-11059) + * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207) + + 3.5 Merged from 3.0: + * Add backpressure to compressed or encrypted commit log (CASSANDRA-10971) * SSTableExport supports secondary index tables (CASSANDRA-11330) * Fix sstabledump to include missing info in debug output (CASSANDRA-11321) * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)