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 0271219378 for ; Fri, 29 Apr 2016 00:23:41 +0000 (UTC) Received: (qmail 44177 invoked by uid 500); 29 Apr 2016 00:23:40 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 44103 invoked by uid 500); 29 Apr 2016 00:23:40 -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 43710 invoked by uid 99); 29 Apr 2016 00:23:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Apr 2016 00:23:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E321AE0B49; Fri, 29 Apr 2016 00:23:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stefania@apache.org To: commits@cassandra.apache.org Date: Fri, 29 Apr 2016 00:23:45 -0000 Message-Id: <3592f4e34ee644d694c5f1a5b7da4955@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38e973d0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38e973d0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38e973d0 Branch: refs/heads/trunk Commit: 38e973d08f8b51fb8b47179318b7e4b9754d34f9 Parents: c8d9555 86c5a00 Author: Stefania Alborghetti Authored: Fri Apr 29 08:17:21 2016 +0800 Committer: Stefania Alborghetti Committed: Fri Apr 29 08:17:21 2016 +0800 ---------------------------------------------------------------------- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/38e973d0/debian/rules ----------------------------------------------------------------------