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 2B4E1111DF for ; Thu, 21 Aug 2014 01:53:50 +0000 (UTC) Received: (qmail 85065 invoked by uid 500); 21 Aug 2014 01:53:49 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 85007 invoked by uid 500); 21 Aug 2014 01:53:49 -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 84626 invoked by uid 99); 21 Aug 2014 01:53:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Aug 2014 01:53:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 498C59BA1EE; Thu, 21 Aug 2014 01:53:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Thu, 21 Aug 2014 01:53:53 -0000 Message-Id: <81e456a2ad3a4b339c80e834ffb65984@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] 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/5aee1288 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5aee1288 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5aee1288 Branch: refs/heads/cassandra-2.1 Commit: 5aee12883de952079aba417075fafb35b8243439 Parents: 1aea6d5 af646fb Author: Benedict Elliott Smith Authored: Thu Aug 21 08:53:12 2014 +0700 Committer: Benedict Elliott Smith Committed: Thu Aug 21 08:53:12 2014 +0700 ---------------------------------------------------------------------- conf/cassandra.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5aee1288/conf/cassandra.yaml ----------------------------------------------------------------------