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 1529D200C2B for ; Thu, 16 Feb 2017 01:22:24 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 13D4E160B76; Thu, 16 Feb 2017 00:22:24 +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 618F1160B75 for ; Thu, 16 Feb 2017 01:22:23 +0100 (CET) Received: (qmail 82525 invoked by uid 500); 16 Feb 2017 00:22:21 -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 82121 invoked by uid 99); 16 Feb 2017 00:22:21 -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, 16 Feb 2017 00:22:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 724C2E04B2; Thu, 16 Feb 2017 00:22:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mshuler@apache.org To: commits@cassandra.apache.org Date: Thu, 16 Feb 2017 00:22:26 -0000 Message-Id: In-Reply-To: <28a46226999f46cbaed545ca53b67960@git.apache.org> References: <28a46226999f46cbaed545ca53b67960@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/23] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 archived-at: Thu, 16 Feb 2017 00:22:24 -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/06bfa06b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06bfa06b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06bfa06b Branch: refs/heads/cassandra-2.2 Commit: 06bfa06bbd154499aa9f09efebd53f0d41210358 Parents: 0b9f6de 943db24 Author: Michael Shuler Authored: Wed Feb 15 18:11:17 2017 -0600 Committer: Michael Shuler Committed: Wed Feb 15 18:11:17 2017 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------