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 BA6882009C5 for ; Mon, 16 May 2016 22:49:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B9505160A1F; Mon, 16 May 2016 20:49:21 +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 09243160A19 for ; Mon, 16 May 2016 22:49:20 +0200 (CEST) Received: (qmail 5185 invoked by uid 500); 16 May 2016 20:49:19 -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 4691 invoked by uid 99); 16 May 2016 20:49:19 -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, 16 May 2016 20:49:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3C723DFF10; Mon, 16 May 2016 20:49:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: carl@apache.org To: commits@cassandra.apache.org Date: Mon, 16 May 2016 20:49:35 -0000 Message-Id: In-Reply-To: <4fdcb5bc784e4406a91fee3d23728fd6@git.apache.org> References: <4fdcb5bc784e4406a91fee3d23728fd6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/21] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 archived-at: Mon, 16 May 2016 20:49:21 -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/ca5bf64b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca5bf64b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca5bf64b Branch: refs/heads/cassandra-3.0 Commit: ca5bf64bf1e9757ab7f53fb5e4803b5dc8ceaac1 Parents: 14918b7 330d7d4 Author: Carl Yeksigian Authored: Mon May 16 16:46:26 2016 -0400 Committer: Carl Yeksigian Committed: Mon May 16 16:46:26 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------