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 1159A1174C for ; Mon, 11 Aug 2014 21:37:21 +0000 (UTC) Received: (qmail 94819 invoked by uid 500); 11 Aug 2014 21:37:18 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 94601 invoked by uid 500); 11 Aug 2014 21:37:18 -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 94059 invoked by uid 99); 11 Aug 2014 21:37:18 -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, 11 Aug 2014 21:37:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3C1B48143B0; Mon, 11 Aug 2014 21:37:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmckenzie@apache.org To: commits@cassandra.apache.org Date: Mon, 11 Aug 2014 21:37:57 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [42/50] [abbrv] 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/2f25e6e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f25e6e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f25e6e6 Branch: refs/heads/cassandra-2.1 Commit: 2f25e6e6ea1b1f428873eb964dfc8df401d2bb2d Parents: 05eac99 8aed419 Author: Sylvain Lebresne Authored: Fri Aug 8 12:51:12 2014 +0200 Committer: Sylvain Lebresne Committed: Fri Aug 8 12:51:12 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 5 +++++ debian/rules | 1 + 3 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f25e6e6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f25e6e6/build.xml ----------------------------------------------------------------------