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 3CEA0200BE4 for ; Wed, 7 Dec 2016 00:35:26 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3B8F1160B2D; Tue, 6 Dec 2016 23:35:26 +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 7BBD2160B29 for ; Wed, 7 Dec 2016 00:35:25 +0100 (CET) Received: (qmail 24047 invoked by uid 500); 6 Dec 2016 23:35: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 22790 invoked by uid 99); 6 Dec 2016 23:35:18 -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, 06 Dec 2016 23:35:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AADECF2139; Tue, 6 Dec 2016 23:35:18 +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, 06 Dec 2016 23:35:47 -0000 Message-Id: <119a644fa47b44478390426f79957166@git.apache.org> In-Reply-To: <8539005f00f5447e8380c72367097aee@git.apache.org> References: <8539005f00f5447e8380c72367097aee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/36] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 archived-at: Tue, 06 Dec 2016 23:35:26 -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/dd8244c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd8244c5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd8244c5 Branch: refs/heads/cassandra-3.X Commit: dd8244c5e0ca0570381d75b82d0c35a3ad167d0f Parents: e7b9c6a 2e93398 Author: Michael Shuler Authored: Tue Dec 6 17:33:48 2016 -0600 Committer: Michael Shuler Committed: Tue Dec 6 17:33:48 2016 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------