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 C7FCD17E70 for ; Mon, 31 Aug 2015 17:05:00 +0000 (UTC) Received: (qmail 54113 invoked by uid 500); 31 Aug 2015 17:04:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 54038 invoked by uid 500); 31 Aug 2015 17:04:59 -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 53720 invoked by uid 99); 31 Aug 2015 17:04:59 -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, 31 Aug 2015 17:04:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 80116E0449; Mon, 31 Aug 2015 17:04:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Mon, 31 Aug 2015 17:05:04 -0000 Message-Id: <34c3081a3d144ca097b49cfc25cd6992@git.apache.org> In-Reply-To: <56a7262aedfa478d82b391551e5b34ff@git.apache.org> References: <56a7262aedfa478d82b391551e5b34ff@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d0c6ef7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d0c6ef7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d0c6ef7 Branch: refs/heads/trunk Commit: 5d0c6ef77461b6b6b488be445c22062e0aa9b936 Parents: ae7afb7 3bc585d Author: Jonathan Ellis Authored: Mon Aug 31 12:04:51 2015 -0500 Committer: Jonathan Ellis Committed: Mon Aug 31 12:04:51 2015 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/config/DatabaseDescriptor.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d0c6ef7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------