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 A39AE200B40 for ; Fri, 1 Jul 2016 22:16:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A2196160A73; Fri, 1 Jul 2016 20:16:25 +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 E22F2160A4D for ; Fri, 1 Jul 2016 22:16:24 +0200 (CEST) Received: (qmail 31161 invoked by uid 500); 1 Jul 2016 20:16:24 -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 31129 invoked by uid 99); 1 Jul 2016 20:16:24 -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; Fri, 01 Jul 2016 20:16:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DA861E0B66; Fri, 1 Jul 2016 20:16:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Fri, 01 Jul 2016 20:16:25 -0000 Message-Id: <0f3da0ae03744a85bc4892228edcde14@git.apache.org> In-Reply-To: <349ebd7a60d0400b9c956b525680f646@git.apache.org> References: <349ebd7a60d0400b9c956b525680f646@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 archived-at: Fri, 01 Jul 2016 20:16:25 -0000 Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: lib/licenses/crc32ex-0.1.1.txt lib/licenses/snappy-java-1.0.5.2.txt lib/licenses/snappy-java-1.0.5.txt lib/licenses/snappy-java-1.1.1.7.txt lib/licenses/thrift-server-0.3.5.txt lib/licenses/thrift-server-0.3.7.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65f8bb6c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65f8bb6c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65f8bb6c Branch: refs/heads/trunk Commit: 65f8bb6c4635fee4e17b2023915701dce59bc3c8 Parents: da20fec bd6ad43 Author: Dave Brosius Authored: Fri Jul 1 16:10:55 2016 -0400 Committer: Dave Brosius Committed: Fri Jul 1 16:10:55 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------