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 89C1A200C53 for ; Tue, 11 Apr 2017 22:54:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 888BF160B9B; Tue, 11 Apr 2017 20:54:30 +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 CCC9C160B7D for ; Tue, 11 Apr 2017 22:54:29 +0200 (CEST) Received: (qmail 27315 invoked by uid 500); 11 Apr 2017 20:54:29 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 27306 invoked by uid 99); 11 Apr 2017 20:54:29 -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; Tue, 11 Apr 2017 20:54:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EB505DFE5C; Tue, 11 Apr 2017 20:54:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: richard@apache.org To: commits@brooklyn.apache.org Message-Id: <9c02610d6fe54cc2984dbc0a13254516@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: brooklyn-docs git commit: LICENSE updates (cherry picked from commit 5faaae3148475e975110a860fc09eb1e82d5559d) Date: Tue, 11 Apr 2017 20:54:28 +0000 (UTC) archived-at: Tue, 11 Apr 2017 20:54:30 -0000 Repository: brooklyn-docs Updated Branches: refs/heads/0.11.x b16f57769 -> b98477b20 LICENSE updates (cherry picked from commit 5faaae3148475e975110a860fc09eb1e82d5559d) Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/b98477b2 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/b98477b2 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/b98477b2 Branch: refs/heads/0.11.x Commit: b98477b201ac5741299f2a0e4fcabcc14a8ba918 Parents: b16f577 Author: Richard Downer Authored: Tue Apr 11 21:09:31 2017 +0100 Committer: Richard Downer Committed: Tue Apr 11 21:53:23 2017 +0100 ---------------------------------------------------------------------- LICENSE | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b98477b2/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index ba06157..f01776f 100644 --- a/LICENSE +++ b/LICENSE @@ -387,6 +387,12 @@ This project includes the software: Swagger UI Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) Copyright (c) SmartBear Software (2011-2015) +This project includes the software: Tango Project Icons + Available at: https://commons.wikimedia.org/wiki/File:Network-server.svg + Inclusive of: tango-project-icons + Used under the following license: Public Domain (https://en.wikipedia.org/wiki/en:public_domain) + Released into the public domain by the people from the Tango! project (The Tango! Desktop Project), via Wikimedia Commons + This project includes the software: typeahead.js Available at: https://github.com/twitter/typeahead.js Developed by: Twitter, Inc (http://twitter.com)