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 5F52710859 for ; Wed, 26 Feb 2014 20:27:49 +0000 (UTC) Received: (qmail 73341 invoked by uid 500); 26 Feb 2014 20:27:27 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 72973 invoked by uid 500); 26 Feb 2014 20:27:21 -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 72869 invoked by uid 99); 26 Feb 2014 20:27:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Feb 2014 20:27:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1AFD989F769; Wed, 26 Feb 2014 20:27:20 +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: Wed, 26 Feb 2014 20:27:23 -0000 Message-Id: <6115038ceadd4ee0bbb2c2feede96dc9@git.apache.org> In-Reply-To: <3463ade4652b4e93bf3ed5afd4796902@git.apache.org> References: <3463ade4652b4e93bf3ed5afd4796902@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbf075d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbf075d2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbf075d2 Branch: refs/heads/cassandra-2.1 Commit: fbf075d28a3820e8d52afc7fcf3fc2260e2e3197 Parents: 583041f 7b5bdd2 Author: Brandon Williams Authored: Wed Feb 26 14:24:17 2014 -0600 Committer: Brandon Williams Committed: Wed Feb 26 14:24:17 2014 -0600 ---------------------------------------------------------------------- debian/cassandra.in.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------