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 9A1DB200C31 for ; Tue, 21 Feb 2017 21:08:14 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 98C3B160B77; Tue, 21 Feb 2017 20:08:14 +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 E412A160B74 for ; Tue, 21 Feb 2017 21:08:13 +0100 (CET) Received: (qmail 56126 invoked by uid 500); 21 Feb 2017 20:08:12 -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 55307 invoked by uid 99); 21 Feb 2017 20:08:11 -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; Tue, 21 Feb 2017 20:08:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B6065E114F; Tue, 21 Feb 2017 20:08:11 +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: Tue, 21 Feb 2017 20:08:18 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/22] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 archived-at: Tue, 21 Feb 2017 20:08:14 -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/56382e38 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56382e38 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56382e38 Branch: refs/heads/trunk Commit: 56382e3853d2fc8ec2a1253737eba5ecd64607c2 Parents: c6462d7 de1f24d Author: Michael Shuler Authored: Tue Feb 21 14:01:19 2017 -0600 Committer: Michael Shuler Committed: Tue Feb 21 14:01:19 2017 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------