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 1C6E4200C6D for ; Sun, 23 Apr 2017 04:44:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1B149160BA2; Sun, 23 Apr 2017 02:44:40 +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 63556160BAD for ; Sun, 23 Apr 2017 04:44:39 +0200 (CEST) Received: (qmail 35889 invoked by uid 500); 23 Apr 2017 02:44:35 -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 35809 invoked by uid 99); 23 Apr 2017 02:44:35 -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; Sun, 23 Apr 2017 02:44:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D61E3E8F07; Sun, 23 Apr 2017 02:44:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mck@apache.org To: commits@cassandra.apache.org Date: Sun, 23 Apr 2017 02:44:36 -0000 Message-Id: <6084118e86574b1eae512da091a4117a@git.apache.org> In-Reply-To: <9b144f4eda4141dd9ce6d9721c1577fe@git.apache.org> References: <9b144f4eda4141dd9ce6d9721c1577fe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk archived-at: Sun, 23 Apr 2017 02:44:40 -0000 Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87169c82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87169c82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87169c82 Branch: refs/heads/trunk Commit: 87169c82f34a72fe3e7d20c96f710b72b0b86a4e Parents: 049ba2d 44eb797 Author: Mick Semb Wever Authored: Sun Apr 23 12:18:54 2017 +1000 Committer: Mick Semb Wever Committed: Sun Apr 23 12:24:28 2017 +1000 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/service/QueryState.java | 6 ----- .../transport/messages/BatchMessage.java | 2 +- .../transport/messages/PrepareMessage.java | 2 +- .../transport/messages/QueryMessage.java | 2 +- .../apache/cassandra/tracing/TracingTest.java | 25 +++++++++++--------- 6 files changed, 19 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87169c82/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87169c82/src/java/org/apache/cassandra/transport/messages/BatchMessage.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87169c82/src/java/org/apache/cassandra/transport/messages/PrepareMessage.java ----------------------------------------------------------------------