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 40462200BA3 for ; Thu, 6 Oct 2016 00:23:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3F02E160ADE; Wed, 5 Oct 2016 22:23:32 +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 7E45C160AEA for ; Thu, 6 Oct 2016 00:23:31 +0200 (CEST) Received: (qmail 47912 invoked by uid 500); 5 Oct 2016 22:23:30 -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 47377 invoked by uid 99); 5 Oct 2016 22:23:29 -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; Wed, 05 Oct 2016 22:23:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B96CAE056F; Wed, 5 Oct 2016 22:23:29 +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: Wed, 05 Oct 2016 22:23:35 -0000 Message-Id: <83a5ef7113e54892b0cda6e6cd62fe55@git.apache.org> In-Reply-To: <2b948e3b50eb413bae87ba1c8ef0770e@git.apache.org> References: <2b948e3b50eb413bae87ba1c8ef0770e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 archived-at: Wed, 05 Oct 2016 22:23:32 -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/975284cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/975284cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/975284cd Branch: refs/heads/cassandra-2.2 Commit: 975284cd570324b83fc3b45e7b25499a0429a95c Parents: c70ce63 87034cd Author: Michael Shuler Authored: Wed Oct 5 17:20:44 2016 -0500 Committer: Michael Shuler Committed: Wed Oct 5 17:20:44 2016 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------