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 9D27218185 for ; Fri, 1 Apr 2016 18:34:14 +0000 (UTC) Received: (qmail 67747 invoked by uid 500); 1 Apr 2016 18:34:11 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 67693 invoked by uid 500); 1 Apr 2016 18:34:11 -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 67374 invoked by uid 99); 1 Apr 2016 18:34:10 -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, 01 Apr 2016 18:34:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8D06E78A5; Fri, 1 Apr 2016 18:34:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jasobrown@apache.org To: commits@cassandra.apache.org Date: Fri, 01 Apr 2016 18:34:17 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [8/9] 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/18f8c2fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18f8c2fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18f8c2fe Branch: refs/heads/trunk Commit: 18f8c2feab449d7e202f877f6fdd6c3cb9d6bcaa Parents: 020a80b d3f6f94 Author: Jason Brown Authored: Fri Apr 1 11:32:12 2016 -0700 Committer: Jason Brown Committed: Fri Apr 1 11:32:43 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/18f8c2fe/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/18f8c2fe/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------