Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9807A200C62 for ; Wed, 26 Apr 2017 19:50:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 969A1160B8F; Wed, 26 Apr 2017 17:50:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D82DE160BB4 for ; Wed, 26 Apr 2017 19:50:01 +0200 (CEST) Received: (qmail 76425 invoked by uid 500); 26 Apr 2017 17:50:00 -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 76065 invoked by uid 99); 26 Apr 2017 17:50:00 -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; Wed, 26 Apr 2017 17:50:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F2222E110B; Wed, 26 Apr 2017 17:49:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spod@apache.org To: commits@cassandra.apache.org Date: Wed, 26 Apr 2017 17:50:05 -0000 Message-Id: In-Reply-To: <84e85d2a542f4c67bb5577e8cf55760c@git.apache.org> References: <84e85d2a542f4c67bb5577e8cf55760c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 archived-at: Wed, 26 Apr 2017 17:50:02 -0000 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c840c0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c840c0c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c840c0c Branch: refs/heads/trunk Commit: 6c840c0cd102c2bfc5e09c68673c03356f9a78fb Parents: 8bb5f1e 868be9c Author: Stefan Podkowinski Authored: Wed Apr 26 19:46:56 2017 +0200 Committer: Stefan Podkowinski Committed: Wed Apr 26 19:46:56 2017 +0200 ---------------------------------------------------------------------- redhat/cassandra | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) ----------------------------------------------------------------------