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 E6E9C1161C for ; Mon, 14 Jul 2014 21:15:22 +0000 (UTC) Received: (qmail 66115 invoked by uid 500); 14 Jul 2014 21:15:22 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 65997 invoked by uid 500); 14 Jul 2014 21:15:22 -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 65982 invoked by uid 99); 14 Jul 2014 21:15:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jul 2014 21:15:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 639B8931ECE; Mon, 14 Jul 2014 21:15:22 +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: Mon, 14 Jul 2014 21:15:23 -0000 Message-Id: <3a5f5ab0eea04bd5b779e97ebbd6ff6b@git.apache.org> In-Reply-To: <036a8319e5cc4acea2271a27980c3c02@git.apache.org> References: <036a8319e5cc4acea2271a27980c3c02@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8243b6ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8243b6ad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8243b6ad Branch: refs/heads/trunk Commit: 8243b6ad0deca4d6f43e41108ca0d79cbd918a35 Parents: 1d508f7 f45a4e3 Author: Jake Luciani Authored: Mon Jul 14 17:15:05 2014 -0400 Committer: Jake Luciani Committed: Mon Jul 14 17:15:05 2014 -0400 ---------------------------------------------------------------------- conf/cassandra.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------