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 8155110DE1 for ; Fri, 11 Mar 2016 19:26:34 +0000 (UTC) Received: (qmail 20278 invoked by uid 500); 11 Mar 2016 19:26:32 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 20205 invoked by uid 500); 11 Mar 2016 19:26:32 -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 19431 invoked by uid 99); 11 Mar 2016 19:26:32 -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; Fri, 11 Mar 2016 19:26:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47D21E00A1; Fri, 11 Mar 2016 19:26:32 +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: Fri, 11 Mar 2016 19:26:44 -0000 Message-Id: In-Reply-To: <604304f8b048484e8c478347ccd9a579@git.apache.org> References: <604304f8b048484e8c478347ccd9a579@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/14] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5 Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2257a7a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2257a7a7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2257a7a7 Branch: refs/heads/cassandra-3.5 Commit: 2257a7a7e25343163b1dfb20f12ef43e19f5a003 Parents: 46860aa 2d48ddf Author: T Jake Luciani Authored: Fri Mar 11 14:25:01 2016 -0500 Committer: T Jake Luciani Committed: Fri Mar 11 14:25:01 2016 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/Config.java | 7 ++++--- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2257a7a7/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2257a7a7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------