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 33435200C01 for ; Wed, 4 Jan 2017 17:01:56 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 31E7E160B47; Wed, 4 Jan 2017 16:01:56 +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 7A9BA160B4A for ; Wed, 4 Jan 2017 17:01:55 +0100 (CET) Received: (qmail 43555 invoked by uid 500); 4 Jan 2017 16:01:53 -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 43207 invoked by uid 99); 4 Jan 2017 16:01:53 -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, 04 Jan 2017 16:01:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3AC65DFB93; Wed, 4 Jan 2017 16:01:53 +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, 04 Jan 2017 16:02:00 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 archived-at: Wed, 04 Jan 2017 16:01:56 -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/c0765ed8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0765ed8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0765ed8 Branch: refs/heads/cassandra-3.11 Commit: c0765ed8205ac5d0b8aa38d229504ff42f7bb6c2 Parents: 5983ce2 0cf0f67 Author: Michael Shuler Authored: Wed Jan 4 09:59:55 2017 -0600 Committer: Michael Shuler Committed: Wed Jan 4 09:59:55 2017 -0600 ---------------------------------------------------------------------- redhat/cassandra | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------