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 2206718038 for ; Wed, 2 Dec 2015 21:32:28 +0000 (UTC) Received: (qmail 85767 invoked by uid 500); 2 Dec 2015 21:32:28 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 85703 invoked by uid 500); 2 Dec 2015 21:32:27 -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 85474 invoked by uid 99); 2 Dec 2015 21:32:27 -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; Wed, 02 Dec 2015 21:32:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B9564E67CA; Wed, 2 Dec 2015 21:32:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Wed, 02 Dec 2015 21:32:28 -0000 Message-Id: In-Reply-To: <1cc892168a5c4299a5c7d2aa6e240ba5@git.apache.org> References: <1cc892168a5c4299a5c7d2aa6e240ba5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e491f05b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e491f05b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e491f05b Branch: refs/heads/cassandra-2.2 Commit: e491f05b71437b47a2d7ed72c2d680188148332a Parents: 1604535 b85da71 Author: Tyler Hobbs Authored: Wed Dec 2 15:32:16 2015 -0600 Committer: Tyler Hobbs Committed: Wed Dec 2 15:32:16 2015 -0600 ---------------------------------------------------------------------- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e491f05b/build.xml ----------------------------------------------------------------------