Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C0379111D4 for ; Tue, 17 Jun 2014 19:10:01 +0000 (UTC) Received: (qmail 74435 invoked by uid 500); 17 Jun 2014 19:10:01 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 74312 invoked by uid 500); 17 Jun 2014 19:10:01 -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 74297 invoked by uid 99); 17 Jun 2014 19:10:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jun 2014 19:10:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 40D74981072; Tue, 17 Jun 2014 19:10:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Tue, 17 Jun 2014 19:10:02 -0000 Message-Id: <4002b1d3ccd340618a4fda5ebb9e34c0@git.apache.org> In-Reply-To: <6fb111129d0048c7a86a6b2ab54e4a85@git.apache.org> References: <6fb111129d0048c7a86a6b2ab54e4a85@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/805a4aee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/805a4aee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/805a4aee Branch: refs/heads/trunk Commit: 805a4aeebe0ef62159951781a294c40e5be3efe7 Parents: 5bd5e25 a3dc7b8 Author: Jake Luciani Authored: Tue Jun 17 15:09:31 2014 -0400 Committer: Jake Luciani Committed: Tue Jun 17 15:09:31 2014 -0400 ---------------------------------------------------------------------- build.xml | 2 +- lib/licenses/netty-all-4.0.19.Final.txt | 202 --------------------------- lib/licenses/netty-all-4.0.20.Final.txt | 202 +++++++++++++++++++++++++++ lib/netty-all-4.0.19.Final.jar | Bin 1678810 -> 0 bytes lib/netty-all-4.0.20.Final.jar | Bin 0 -> 1721619 bytes 5 files changed, 203 insertions(+), 203 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/805a4aee/build.xml ----------------------------------------------------------------------