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 69C232009D9 for ; Wed, 18 May 2016 03:03:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 686BB160A1F; Wed, 18 May 2016 01:03:18 +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 A9963160A21 for ; Wed, 18 May 2016 03:03:17 +0200 (CEST) Received: (qmail 94723 invoked by uid 500); 18 May 2016 01:03:15 -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 94370 invoked by uid 99); 18 May 2016 01:03:15 -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, 18 May 2016 01:03:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7BB0DE947E; Wed, 18 May 2016 01:03:15 +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: Wed, 18 May 2016 01:03:24 -0000 Message-Id: <339d250c3aea43ee870b3ab41b7bbf73@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/10] cassandra git commit: Merge branch 'cassandra-3.7' into trunk archived-at: Wed, 18 May 2016 01:03:18 -0000 Merge branch 'cassandra-3.7' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f2443618 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2443618 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2443618 Branch: refs/heads/trunk Commit: f2443618f22521a9b75a52536f2f2a9e328badc6 Parents: fb466f9 33ddb67 Author: Stefania Alborghetti Authored: Wed May 18 08:59:11 2016 +0800 Committer: Stefania Alborghetti Committed: Wed May 18 08:59:11 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/tracing.py | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2443618/CHANGES.txt ----------------------------------------------------------------------