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 405C510FFB for ; Wed, 16 Jul 2014 21:18:09 +0000 (UTC) Received: (qmail 33041 invoked by uid 500); 16 Jul 2014 21:18:07 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 32963 invoked by uid 500); 16 Jul 2014 21:18:07 -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 32631 invoked by uid 99); 16 Jul 2014 21:18:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jul 2014 21:18:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 54A2199B31F; Wed, 16 Jul 2014 21:18:07 +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: Wed, 16 Jul 2014 21:18:17 -0000 Message-Id: <93667fa6b318432ba43609572836deae@git.apache.org> In-Reply-To: <8245f9913aa2422ea2311cfd3a64ebb2@git.apache.org> References: <8245f9913aa2422ea2311cfd3a64ebb2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/12] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1 Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/367a3696 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/367a3696 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/367a3696 Branch: refs/heads/cassandra-2.1 Commit: 367a3696b3f6fb670a362562b7ded92f8ad21088 Parents: 4b2e946 545e2e1 Author: Jonathan Ellis Authored: Wed Jul 16 16:17:53 2014 -0500 Committer: Jonathan Ellis Committed: Wed Jul 16 16:17:53 2014 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/367a3696/conf/cassandra.yaml ----------------------------------------------------------------------