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 E7A9511B32 for ; Tue, 1 Jul 2014 18:40:24 +0000 (UTC) Received: (qmail 38360 invoked by uid 500); 1 Jul 2014 18:40:24 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 38241 invoked by uid 500); 1 Jul 2014 18:40:24 -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 38209 invoked by uid 99); 1 Jul 2014 18:40:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jul 2014 18:40:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5FAF3991EED; Tue, 1 Jul 2014 18:40:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Tue, 01 Jul 2014 18:40:25 -0000 Message-Id: In-Reply-To: <5aba25a6055c4f2884c9afe84c48388e@git.apache.org> References: <5aba25a6055c4f2884c9afe84c48388e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] 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/c70daa8e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c70daa8e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c70daa8e Branch: refs/heads/trunk Commit: c70daa8ed3ff70868815ed7ccd032b69bc0b5d7c Parents: 5dc04e7 3958fc4 Author: Jake Luciani Authored: Tue Jul 1 14:39:47 2014 -0400 Committer: Jake Luciani Committed: Tue Jul 1 14:39:47 2014 -0400 ---------------------------------------------------------------------- test/conf/cassandra.yaml | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------