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 3706318C72 for ; Thu, 14 Jan 2016 14:50:25 +0000 (UTC) Received: (qmail 49347 invoked by uid 500); 14 Jan 2016 14:50:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49273 invoked by uid 500); 14 Jan 2016 14:50: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 49258 invoked by uid 99); 14 Jan 2016 14:50:24 -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; Thu, 14 Jan 2016 14:50:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8E9BE3877; Thu, 14 Jan 2016 14:50:24 +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: Thu, 14 Jan 2016 14:50:25 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch 'cassandra-3.3' into trunk Merge branch 'cassandra-3.3' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efc7d1b9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efc7d1b9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efc7d1b9 Branch: refs/heads/trunk Commit: efc7d1b9ad7b0c6e79f4c4b2c60826fa0017d08c Parents: 512a2fa e1938e2 Author: T Jake Luciani Authored: Thu Jan 14 09:50:12 2016 -0500 Committer: T Jake Luciani Committed: Thu Jan 14 09:50:12 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/efc7d1b9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b59f182,bf873fc..e7ff168 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ +3.4 + * Simplify row cache invalidation code (CASSANDRA-10396) + * Support user-defined compaction through nodetool (CASSANDRA-10660) + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981) + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953) + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838) + + 3.3 + * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010) Merged from 3.0: * Ensure stale index entries are purged during reads (CASSANDRA-11013) * (cqlsh) Also apply --connect-timeout to control connection