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 DC818200B26 for ; Mon, 27 Jun 2016 18:14:05 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DB2C4160A5B; Mon, 27 Jun 2016 16:14:05 +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 2AAEE160A62 for ; Mon, 27 Jun 2016 18:14:05 +0200 (CEST) Received: (qmail 50047 invoked by uid 500); 27 Jun 2016 16:14:04 -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 49945 invoked by uid 99); 27 Jun 2016 16:14:04 -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; Mon, 27 Jun 2016 16:14:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E2FB1DFFF8; Mon, 27 Jun 2016 16:14:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Mon, 27 Jun 2016 16:14:05 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 archived-at: Mon, 27 Jun 2016 16:14:06 -0000 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/6fcf3353 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fcf3353 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fcf3353 Branch: refs/heads/cassandra-2.2 Commit: 6fcf3353b65195f0b1d0c1e20c5b8d562a8d21d5 Parents: 5d0d30e 341b3fb Author: Jonathan Ellis Authored: Mon Jun 27 11:13:56 2016 -0500 Committer: Jonathan Ellis Committed: Mon Jun 27 11:13:56 2016 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------