You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/04/20 08:27:36 UTC
[1/2] brooklyn-server git commit: LICENSE updates
Repository: brooklyn-server
Updated Branches:
refs/heads/master 22f82ce32 -> 745d6de61
LICENSE updates
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3e3ad609
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3e3ad609
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3e3ad609
Branch: refs/heads/master
Commit: 3e3ad6095c54285dd770638b4c3544c215ecc8f9
Parents: 6885674
Author: Richard Downer <ri...@apache.org>
Authored: Tue Apr 11 21:10:15 2017 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Apr 11 21:10:15 2017 +0100
----------------------------------------------------------------------
LICENSE | 4 ++--
server-cli/src/main/license/files/LICENSE | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3e3ad609/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 22142e1..f01776f 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/* cluster.svg
+ Inclusive of: font-awesome/fonts/*
Version used: 4.5.0
Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
Copyright (c) Dave Gandy (2016)
@@ -389,7 +389,7 @@ This project includes the software: Swagger UI
This project includes the software: Tango Project Icons
Available at: https://commons.wikimedia.org/wiki/File:Network-server.svg
- Inclusive of: 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
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3e3ad609/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 9e1284e..f8841ee 100644
--- a/server-cli/src/main/license/files/LICENSE
+++ b/server-cli/src/main/license/files/LICENSE
@@ -196,14 +196,14 @@ Contents:
This project includes the software: Font Awesome (fonts)
Available at: http://fontawesome.io/
- Inclusive of: font-awesome/fonts/* cluster.svg
+ Inclusive of: font-awesome/fonts/*
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
+ 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
[2/2] brooklyn-server git commit: This closes #630
Posted by dr...@apache.org.
This closes #630
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/745d6de6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/745d6de6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/745d6de6
Branch: refs/heads/master
Commit: 745d6de613705ad16456fc5cb3402b48ec7cd296
Parents: 22f82ce 3e3ad60
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Thu Apr 20 09:27:26 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Thu Apr 20 09:27:26 2017 +0100
----------------------------------------------------------------------
LICENSE | 4 ++--
server-cli/src/main/license/files/LICENSE | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------