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 DD23FDC36 for ; Sun, 14 Oct 2012 18:59:36 +0000 (UTC) Received: (qmail 81480 invoked by uid 500); 14 Oct 2012 18:59:36 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 81387 invoked by uid 500); 14 Oct 2012 18:59: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 81258 invoked by uid 99); 14 Oct 2012 18:59: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; Sun, 14 Oct 2012 18:59:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AFB5B44C44; Sun, 14 Oct 2012 18:59:35 +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 X-Mailer: ASF-Git Admin Mailer Subject: [2/5] git commit: Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk Message-Id: <20121014185935.AFB5B44C44@tyr.zones.apache.org> Date: Sun, 14 Oct 2012 18:59:35 +0000 (UTC) Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5ac7647 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5ac7647 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5ac7647 Branch: refs/heads/trunk Commit: e5ac7647dd7b482a2ee3c62657e1d33b60dccf8f Parents: 097df17 c06c276 Author: Dave Brosius Authored: Sun Oct 14 14:21:47 2012 -0400 Committer: Dave Brosius Committed: Sun Oct 14 14:21:47 2012 -0400 ---------------------------------------------------------------------- build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------