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 0245A200B5E for ; Tue, 26 Jul 2016 17:58:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 012BD160A7D; Tue, 26 Jul 2016 15:58:32 +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 43524160A95 for ; Tue, 26 Jul 2016 17:58:31 +0200 (CEST) Received: (qmail 32519 invoked by uid 500); 26 Jul 2016 15:58:29 -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 32048 invoked by uid 99); 26 Jul 2016 15:58:29 -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; Tue, 26 Jul 2016 15:58:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 51FEAE78B2; Tue, 26 Jul 2016 15:58:29 +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: Tue, 26 Jul 2016 15:58:36 -0000 Message-Id: <245803d7643e42bd939c6557aba40c8c@git.apache.org> In-Reply-To: <27d677dffe384028900d9fc232ce2cc4@git.apache.org> References: <27d677dffe384028900d9fc232ce2cc4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/12] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 archived-at: Tue, 26 Jul 2016 15:58:32 -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/023d2e98 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/023d2e98 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/023d2e98 Branch: refs/heads/trunk Commit: 023d2e98f1a49221c773f2c1c6fb533d6bcc059a Parents: 0bb133e 04ef62c Author: Jonathan Ellis Authored: Tue Jul 26 10:54:55 2016 -0500 Committer: Jonathan Ellis Committed: Tue Jul 26 10:54:55 2016 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/023d2e98/conf/cassandra.yaml ----------------------------------------------------------------------