You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2017/11/09 11:44:04 UTC

[1/2] brooklyn-dist git commit: add license info for icons added to brooklyn-server project

Repository: brooklyn-dist
Updated Branches:
  refs/heads/master b44ff600e -> 48a456a99


add license info for icons added to brooklyn-server project


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/f5134c05
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/f5134c05
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/f5134c05

Branch: refs/heads/master
Commit: f5134c052dc90fc5bc3f625038953bae0ff5f825
Parents: 4b555fc
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Nov 8 11:40:38 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Nov 8 11:58:52 2017 +0000

----------------------------------------------------------------------
 dist/licensing/overrides.yaml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/f5134c05/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/dist/licensing/overrides.yaml b/dist/licensing/overrides.yaml
index 3e46836..d3cfc27 100644
--- a/dist/licensing/overrides.yaml
+++ b/dist/licensing/overrides.yaml
@@ -434,7 +434,7 @@
   name: Font Awesome (fonts)
   version: 4.5.0
   url: http://fontawesome.io/
-  files: "font-awesome/fonts/*"
+  files: "font-awesome/fonts/* cluster.svg"
   notice: Copyright (c) Dave Gandy (2016)
   license:
   - url: "http://scripts.sil.org/OFL"
@@ -456,3 +456,13 @@
   - url: https://en.wikipedia.org/wiki/en:public_domain
     name: Public Domain
 
+- id: noun-project-icons
+  name: The Noun Project (icons)
+  url: https://thenounproject.com/
+  notice: Includes icons by Evan Shuster, Sarah Joy, Jack Zwanenburg
+  files: "service-restarter.png, autoscaler.png, and others"
+  license:
+  - url: https://creativecommons.org/licenses/by/3.0/us/legalcode
+    name: Creative Commons Public License, Attribution 3.0
+
+


[2/2] brooklyn-dist git commit: This closes #113

Posted by tb...@apache.org.
This closes #113


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/48a456a9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/48a456a9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/48a456a9

Branch: refs/heads/master
Commit: 48a456a99ce28676f77c394b1c68fa79da5de3d8
Parents: b44ff60 f5134c0
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Thu Nov 9 11:43:33 2017 +0000
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Thu Nov 9 11:43:33 2017 +0000

----------------------------------------------------------------------
 dist/licensing/overrides.yaml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------