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 CE89B200AED for ; Tue, 3 May 2016 20:27:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CD1381609F6; Tue, 3 May 2016 20:27:16 +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 2864E1609A9 for ; Tue, 3 May 2016 20:27:16 +0200 (CEST) Received: (qmail 98934 invoked by uid 500); 3 May 2016 18:27:15 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 98923 invoked by uid 99); 3 May 2016 18:27:15 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2016 18:27:15 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id D57BC180361 for ; Tue, 3 May 2016 18:27:14 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.999 X-Spam-Level: X-Spam-Status: No, score=0.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id kG8L2WR2vzSD for ; Tue, 3 May 2016 18:27:14 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id A3E6B60DED for ; Tue, 3 May 2016 18:27:13 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id A48AAE009C for ; Tue, 3 May 2016 18:27:12 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id A57093A019B for ; Tue, 3 May 2016 18:27:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1742171 - /zookeeper/trunk/src/LICENSE.txt Date: Tue, 03 May 2016 18:27:12 -0000 To: commits@zookeeper.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160503182712.A57093A019B@svn01-us-west.apache.org> archived-at: Tue, 03 May 2016 18:27:17 -0000 Author: phunt Date: Tue May 3 18:27:12 2016 New Revision: 1742171 URL: http://svn.apache.org/viewvc?rev=1742171&view=rev Log: ZOOKEEPER-2235 License update - fix servlet-api license (fpj via phunt) Modified: zookeeper/trunk/src/LICENSE.txt Modified: zookeeper/trunk/src/LICENSE.txt URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/LICENSE.txt?rev=1742171&r1=1742170&r2=1742171&view=diff ============================================================================== --- zookeeper/trunk/src/LICENSE.txt (original) +++ zookeeper/trunk/src/LICENSE.txt Tue May 3 18:27:12 2016 @@ -210,10 +210,6 @@ This distribution bundles jline 2.11, wh 2-clause BSD License. For details, see a copy of the license in lib/jline-2.11.LICENSE.txt -This distribution bundles servlet-api-2.5, which is available under the CDDL -License. For details, see a copy of the license in -lib/servlet-api-2.5.LICENSE.txt - This distribution bundles SLF4J 1.7.5, which is available under the MIT License. For details, see a copy of the license in lib/slf4j-1.7.5.LICENSE.txt