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 88AF411237 for ; Thu, 10 Jul 2014 12:27:38 +0000 (UTC) Received: (qmail 54511 invoked by uid 500); 10 Jul 2014 12:27:37 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 54438 invoked by uid 500); 10 Jul 2014 12:27:37 -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 54212 invoked by uid 99); 10 Jul 2014 12:27:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2014 12:27:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 61F5F9AACB7; Thu, 10 Jul 2014 12:27:37 +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: Thu, 10 Jul 2014 12:27:42 -0000 Message-Id: <4b74f81448b244c6b46e75adf61151a6@git.apache.org> In-Reply-To: <249057128e234fc18b1dd164fc356d5e@git.apache.org> References: <249057128e234fc18b1dd164fc356d5e@git.apache.org> 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/bb2fdd01 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb2fdd01 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb2fdd01 Branch: refs/heads/trunk Commit: bb2fdd0183d3f231fb35ec75d2a3ed0a1f2a182e Parents: ac4a026 4d8fea1 Author: Brandon Williams Authored: Thu Jul 10 07:27:29 2014 -0500 Committer: Brandon Williams Committed: Thu Jul 10 07:27:29 2014 -0500 ---------------------------------------------------------------------- debian/cassandra.in.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------