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/05/04 10:35:27 UTC

[1/2] brooklyn git commit: LICENSE updates

Repository: brooklyn
Updated Branches:
  refs/heads/master 6263e7cb0 -> 164dcff75


LICENSE updates

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

Branch: refs/heads/master
Commit: cc6e8cfc13e98f0cbab05a806588b506b20a6d8c
Parents: 406d5b5
Author: Richard Downer <ri...@apache.org>
Authored: Tue Apr 11 21:10:27 2017 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Apr 11 21:10:27 2017 +0100

----------------------------------------------------------------------
 LICENSE | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/cc6e8cfc/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)


[2/2] brooklyn git commit: This closes #10

Posted by dr...@apache.org.
This closes #10


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

Branch: refs/heads/master
Commit: 164dcff75720c60592fa04a5942236246f7a1a62
Parents: 6263e7c cc6e8cf
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Thu May 4 11:35:07 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Thu May 4 11:35:07 2017 +0100

----------------------------------------------------------------------
 LICENSE | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------