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 992CE200D66 for ; Thu, 14 Dec 2017 15:03:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 97A08160C01; Thu, 14 Dec 2017 14:03: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 E180E160C25 for ; Thu, 14 Dec 2017 15:03:42 +0100 (CET) Received: (qmail 14372 invoked by uid 500); 14 Dec 2017 14:03:37 -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 14278 invoked by uid 99); 14 Dec 2017 14:03:37 -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 Dec 2017 14:03:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 95694DFF75; Thu, 14 Dec 2017 14:03:33 +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: Thu, 14 Dec 2017 14:03:38 -0000 Message-Id: In-Reply-To: <63ac830cd6994c75957eaded97f0be95@git.apache.org> References: <63ac830cd6994c75957eaded97f0be95@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/10] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0 archived-at: Thu, 14 Dec 2017 14:03:43 -0000 Merge branch cassandra-2.2 into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5050aa34 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5050aa34 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5050aa34 Branch: refs/heads/cassandra-3.0 Commit: 5050aa3478da8939d800df9f479f928e96842928 Parents: db788fe b800f3c Author: Benjamin Lerer Authored: Thu Dec 14 14:55:24 2017 +0100 Committer: Benjamin Lerer Committed: Thu Dec 14 14:55:24 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StartupChecks.java | 33 +----- .../org/apache/cassandra/utils/JavaUtils.java | 115 +++++++++++++++++++ .../apache/cassandra/utils/JavaUtilsTest.java | 52 +++++++++ 4 files changed, 170 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5050aa34/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ee90a67,266ed14..0574893 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -2.2.12 +3.0.16 + * Improve commit log chain marker updating (CASSANDRA-14108) + * Extra range tombstone bound creates double rows (CASSANDRA-14008) + * Fix SStable ordering by max timestamp in SinglePartitionReadCommand (CASSANDRA-14010) + * Accept role names containing forward-slash (CASSANDRA-14088) + * Optimize CRC check chance probability calculations (CASSANDRA-14094) + * Fix cleanup on keyspace with no replicas (CASSANDRA-13526) + * Fix updating base table rows with TTL not removing materialized view entries (CASSANDRA-14071) + * Reduce garbage created by DynamicSnitch (CASSANDRA-14091) + * More frequent commitlog chained markers (CASSANDRA-13987) + * Fix serialized size of DataLimits (CASSANDRA-14057) + * Add flag to allow dropping oversized read repair mutations (CASSANDRA-13975) + * Fix SSTableLoader logger message (CASSANDRA-14003) + * Fix repair race that caused gossip to block (CASSANDRA-13849) + * Tracing interferes with digest requests when using RandomPartitioner (CASSANDRA-13964) + * Add flag to disable materialized views, and warnings on creation (CASSANDRA-13959) + * Don't let user drop or generally break tables in system_distributed (CASSANDRA-13813) + * Provide a JMX call to sync schema with local storage (CASSANDRA-13954) + * Mishandling of cells for removed/dropped columns when reading legacy files (CASSANDRA-13939) + * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922) +Merged from 2.2: + * Fix the inspectJvmOptions startup check (CASSANDRA-14112) * Fix race that prevents submitting compaction for a table when executor is full (CASSANDRA-13801) * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006) * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5050aa34/src/java/org/apache/cassandra/service/StartupChecks.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org