Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-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 034E118240 for ; Wed, 11 Nov 2015 23:07:22 +0000 (UTC) Received: (qmail 20011 invoked by uid 500); 11 Nov 2015 23:07:14 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 19525 invoked by uid 500); 11 Nov 2015 23:07:14 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 17845 invoked by uid 99); 11 Nov 2015 23:07:13 -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, 11 Nov 2015 23:07:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9EF29E083A; Wed, 11 Nov 2015 23:07:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Wed, 11 Nov 2015 23:07:47 -0000 Message-Id: <876150875d2b4a188e95e1473f825226@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [35/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653 add react-bootstrap license Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/45a6c5dd Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/45a6c5dd Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/45a6c5dd Branch: refs/heads/2876-js-tests Commit: 45a6c5dd716a4811a07e8d8f0df42bcce48f7777 Parents: 63e8859 Author: Robert Kowalski Authored: Sat Oct 24 16:40:41 2015 +0200 Committer: Robert Kowalski Committed: Sat Oct 24 16:40:41 2015 +0200 ---------------------------------------------------------------------- LICENSE | 24 ++++++++++++++++++++++++ NOTICE | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/45a6c5dd/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 2deab42..6ad7e26 100644 --- a/LICENSE +++ b/LICENSE @@ -1408,3 +1408,27 @@ for src/fauxton/assets/js/libs/papaparse.js COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +for src/fauxton/assets/js/libs/react-bootstrap.js + + The MIT License (MIT) + + Copyright (c) 2014 Stephen J. Collings, Matthew Honnibal, Pieter Vanderwerff + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. http://git-wip-us.apache.org/repos/asf/couchdb/blob/45a6c5dd/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index ea5eb56..978ee6e 100644 --- a/NOTICE +++ b/NOTICE @@ -190,6 +190,10 @@ This product also includes the following third-party components: Copyright Mathias Bynens -* Papaparse.js +* Papaparse.js Copyright (c) 2015 Matthew Holt + +* react-bootstrap.js + + Copyright (c) 2014 Stephen J. Collings, Matthew Honnibal, Pieter Vanderwerff