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 0EF7811FC5 for ; Sat, 29 Mar 2014 01:14:38 +0000 (UTC) Received: (qmail 23625 invoked by uid 500); 29 Mar 2014 01:14:37 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 23581 invoked by uid 500); 29 Mar 2014 01:14:36 -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 23562 invoked by uid 99); 29 Mar 2014 01:14:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Mar 2014 01:14:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 42B05838114; Sat, 29 Mar 2014 01:14:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Sat, 29 Mar 2014 01:14:37 -0000 Message-Id: In-Reply-To: <19a8aedd965f4ade942bb57a15d60a95@git.apache.org> References: <19a8aedd965f4ade942bb57a15d60a95@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/eeef4061 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eeef4061 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eeef4061 Branch: refs/heads/trunk Commit: eeef4061b7beb181ccad0b81ad7807bef3ef6367 Parents: 724951b 6844462 Author: Dave Brosius Authored: Fri Mar 28 21:14:04 2014 -0400 Committer: Dave Brosius Committed: Fri Mar 28 21:14:04 2014 -0400 ---------------------------------------------------------------------- build.xml | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eeef4061/build.xml ----------------------------------------------------------------------