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 0187D10243 for ; Tue, 25 Feb 2014 21:23:05 +0000 (UTC) Received: (qmail 78760 invoked by uid 500); 25 Feb 2014 21:23:00 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 78534 invoked by uid 500); 25 Feb 2014 21:22:58 -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 78418 invoked by uid 99); 25 Feb 2014 21:22:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Feb 2014 21:22:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 558A192CDB6; Tue, 25 Feb 2014 21:22:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Tue, 25 Feb 2014 21:23:01 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] 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/97f31303 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97f31303 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97f31303 Branch: refs/heads/trunk Commit: 97f31303bb5aaf92588a414290dd5dbb3e46c73d Parents: 1d59872 3f614ff Author: Brandon Williams Authored: Tue Feb 25 15:20:04 2014 -0600 Committer: Brandon Williams Committed: Tue Feb 25 15:20:04 2014 -0600 ---------------------------------------------------------------------- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------