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 DE5CA200ACC for ; Mon, 2 May 2016 17:10:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DBD621609B0; Mon, 2 May 2016 17:10:03 +0200 (CEST) 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 256C51609A6 for ; Mon, 2 May 2016 17:10:02 +0200 (CEST) Received: (qmail 29240 invoked by uid 500); 2 May 2016 15:09:57 -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 28915 invoked by uid 99); 2 May 2016 15:09:57 -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; Mon, 02 May 2016 15:09:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0CE4DDFDD0; Mon, 2 May 2016 15:09:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snazy@apache.org To: commits@cassandra.apache.org Date: Mon, 02 May 2016 15:09:59 -0000 Message-Id: <0d519caabc96445ebc5e4a3353ab5591@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk archived-at: Mon, 02 May 2016 15:10:04 -0000 Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b57e6bd8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b57e6bd8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b57e6bd8 Branch: refs/heads/trunk Commit: b57e6bd846d202c466ca21ec68efc65bf838106a Parents: 9581209 a1cc804 Author: Robert Stupp Authored: Mon May 2 17:09:37 2016 +0200 Committer: Robert Stupp Committed: Mon May 2 17:09:37 2016 +0200 ---------------------------------------------------------------------- lib/licenses/ohc-0.4.2.txt | 201 ---------------------------------------- lib/licenses/ohc-0.4.3.txt | 201 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 201 insertions(+), 201 deletions(-) ----------------------------------------------------------------------