Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7CB93200BDA for ; Tue, 13 Dec 2016 19:36:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7B82F160B07; Tue, 13 Dec 2016 18:36:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C4B5D160B32 for ; Tue, 13 Dec 2016 19:36:42 +0100 (CET) Received: (qmail 69027 invoked by uid 500); 13 Dec 2016 18:36:40 -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 68588 invoked by uid 99); 13 Dec 2016 18:36:40 -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, 13 Dec 2016 18:36:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 28403E0772; Tue, 13 Dec 2016 18:36:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: carl@apache.org To: commits@cassandra.apache.org Date: Tue, 13 Dec 2016 18:36:49 -0000 Message-Id: <2f2aefb2b2754e33b49f67056a6742c9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/10] cassandra git commit: Merge branch 'cassandra-3.X' into trunk archived-at: Tue, 13 Dec 2016 18:36:43 -0000 Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd5aacc8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd5aacc8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd5aacc8 Branch: refs/heads/trunk Commit: cd5aacc83bc3ee2b412c191a8ce711b0401bf55a Parents: d596a47 ddefb1d Author: Carl Yeksigian Authored: Tue Dec 13 12:29:18 2016 -0500 Committer: Carl Yeksigian Committed: Tue Dec 13 12:29:18 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 24 ++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd5aacc8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 1f18fd9,14ee562..83b9082 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -133,8 -123,9 +133,9 @@@ * Remove pre-startup check for open JMX port (CASSANDRA-12074) * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) * Restore resumable hints delivery (CASSANDRA-11960) - * Properly report LWT contention (CASSANDRA-12626) + * Properly record CAS contention (CASSANDRA-12626) Merged from 3.0: + * Mark MVs as built after successful bootstrap (CASSANDRA-12984) * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) * Thread local pools never cleaned up (CASSANDRA-13033) http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd5aacc8/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------