You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/02/21 12:35:04 UTC
[3/3] brooklyn-server git commit: update LICENSE files with latest
changes
update LICENSE files with latest changes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5cbfd5fa
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5cbfd5fa
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5cbfd5fa
Branch: refs/heads/master
Commit: 5cbfd5fab5799caa2b9515e37fafff93e164547a
Parents: d6760d3
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Feb 21 12:33:27 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Feb 21 12:33:27 2017 +0000
----------------------------------------------------------------------
LICENSE | 8 +++++++-
server-cli/src/main/license/files/LICENSE | 13 +++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5cbfd5fa/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index ba06157..22142e1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -230,7 +230,7 @@ This project includes the software: Font Awesome (code)
This project includes the software: Font Awesome (fonts)
Available at: http://fontawesome.io/
- Inclusive of: font-awesome/fonts/*
+ Inclusive of: font-awesome/fonts/* cluster.svg
Version used: 4.5.0
Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
Copyright (c) Dave Gandy (2016)
@@ -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: server.svg
+ 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)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5cbfd5fa/server-cli/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/server-cli/src/main/license/files/LICENSE b/server-cli/src/main/license/files/LICENSE
index 2a36072..9e1284e 100644
--- a/server-cli/src/main/license/files/LICENSE
+++ b/server-cli/src/main/license/files/LICENSE
@@ -194,6 +194,19 @@ Contents:
(2) Notices for bundled software
+This project includes the software: Font Awesome (fonts)
+ Available at: http://fontawesome.io/
+ Inclusive of: font-awesome/fonts/* cluster.svg
+ Version used: 4.5.0
+ Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
+ Copyright (c) Dave Gandy (2016)
+
+This project includes the software: Tango Project Icons
+ Available at: https://commons.wikimedia.org/wiki/File:Network-server.svg
+ Inclusive of: server.svg
+ 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)