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 0FF90200C1A for ; Mon, 13 Feb 2017 12:04:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 0E841160B4D; Mon, 13 Feb 2017 11:04:46 +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 5D377160B6F for ; Mon, 13 Feb 2017 12:04:45 +0100 (CET) Received: (qmail 40649 invoked by uid 500); 13 Feb 2017 11:04:44 -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 40517 invoked by uid 99); 13 Feb 2017 11:04:44 -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, 13 Feb 2017 11:04:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B8408DFF1F; Mon, 13 Feb 2017 11:04:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stefania@apache.org To: commits@cassandra.apache.org Date: Mon, 13 Feb 2017 11:04:48 -0000 Message-Id: In-Reply-To: <97d155b91e094444a4c3651a62ed4211@git.apache.org> References: <97d155b91e094444a4c3651a62ed4211@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk archived-at: Mon, 13 Feb 2017 11:04:46 -0000 Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffc82b1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffc82b1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffc82b1e Branch: refs/heads/trunk Commit: ffc82b1ee495fcf068730d0d3c12f54afdf517a2 Parents: 1eaef3f 01b91cc Author: Stefania Alborghetti Authored: Mon Feb 13 11:02:17 2017 +0000 Committer: Stefania Alborghetti Committed: Mon Feb 13 11:02:17 2017 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StartupChecks.java | 50 ++++++++++++++++++++ .../org/apache/cassandra/utils/FBUtilities.java | 1 + .../cassandra/service/StartupChecksTest.java | 7 +++ 4 files changed, 59 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffc82b1e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7c38295,67c45e8..39f9513 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -37,7 -7,7 +37,8 @@@ * More fixes to the TokenAllocator (CASSANDRA-12990) * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) Merged from 3.0: + * Add vm.max_map_count StartupCheck (CASSANDRA-13008) + * Obfuscate password in stress-graphs (CASSANDRA-12233) * Hint related logging should include the IP address of the destination in addition to host ID (CASSANDRA-13205) * Reloading logback.xml does not work (CASSANDRA-13173) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffc82b1e/src/java/org/apache/cassandra/service/StartupChecks.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StartupChecks.java index 0458820,2774931..b519350 --- a/src/java/org/apache/cassandra/service/StartupChecks.java +++ b/src/java/org/apache/cassandra/service/StartupChecks.java @@@ -29,10 -30,11 +30,11 @@@ import com.google.common.collect.Iterab import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.schema.TableMetadata; + import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.Schema; -import org.apache.cassandra.config.SchemaConstants; +import org.apache.cassandra.schema.Schema; +import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.SystemKeyspace; http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffc82b1e/test/unit/org/apache/cassandra/service/StartupChecksTest.java ----------------------------------------------------------------------