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 5F2FA200BB1 for ; Thu, 20 Oct 2016 06:04:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5DC2C160AFF; Thu, 20 Oct 2016 04:04:25 +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 9A9BE160AFB for ; Thu, 20 Oct 2016 06:04:24 +0200 (CEST) Received: (qmail 27421 invoked by uid 500); 20 Oct 2016 04:04:23 -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 27125 invoked by uid 99); 20 Oct 2016 04:04:23 -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; Thu, 20 Oct 2016 04:04:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4B65EDFAAB; Thu, 20 Oct 2016 04:04:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jjirsa@apache.org To: commits@cassandra.apache.org Date: Thu, 20 Oct 2016 04:04:28 -0000 Message-Id: <07dc21ac7b7e4c4b98bd31bd9acb5b3e@git.apache.org> In-Reply-To: <7d667591ef904f068347cad9d4cb0fe7@git.apache.org> References: <7d667591ef904f068347cad9d4cb0fe7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-3.X' into trunk archived-at: Thu, 20 Oct 2016 04:04:25 -0000 Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb8e951b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb8e951b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb8e951b Branch: refs/heads/trunk Commit: cb8e951b29795ef2072c858686f7fe478423dae3 Parents: e6e82a7 d8c8366 Author: Jeff Jirsa Authored: Wed Oct 19 21:02:26 2016 -0700 Committer: Jeff Jirsa Committed: Wed Oct 19 21:02:26 2016 -0700 ---------------------------------------------------------------------- ----------------------------------------------------------------------