You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2014/09/09 06:41:00 UTC

git commit: AMBARI-6639. License of Font Awesome is wrong in NOTICE.txt. (Jun Aoki via mahadev)

Repository: ambari
Updated Branches:
  refs/heads/trunk 221c5a13f -> 2ef3506a9


AMBARI-6639. License of Font Awesome is wrong in NOTICE.txt. (Jun Aoki via mahadev)


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

Branch: refs/heads/trunk
Commit: 2ef3506a9dc4aab0e6eb3799cf0eed0c141b3008
Parents: 221c5a1
Author: Mahadev Konar <ma...@apache.org>
Authored: Mon Sep 8 21:40:43 2014 -0700
Committer: Mahadev Konar <ma...@apache.org>
Committed: Mon Sep 8 21:40:43 2014 -0700

----------------------------------------------------------------------
 ambari-web/app/assets/licenses/NOTICE.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef3506a/ambari-web/app/assets/licenses/NOTICE.txt
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/licenses/NOTICE.txt b/ambari-web/app/assets/licenses/NOTICE.txt
index d317866..82231f0 100644
--- a/ambari-web/app/assets/licenses/NOTICE.txt
+++ b/ambari-web/app/assets/licenses/NOTICE.txt
@@ -30,7 +30,7 @@ Copyright (c) 2012, Michael Bostock.
 This product includes bootstrap-datepicker.js (http://www.eyecon.ro/bootstrap-datepicker - Apache License, Version 2.0)
 Copyright (c) 2012 Stefan Petre
 
-This product includes Font Awesome 3.2.1 (http://fortawesome.github.com/Font-Awesome - Creative Commons 3.0)
+This product includes Font Awesome 3.2.1 (http://fortawesome.github.com/Font-Awesome - SIL OFL 1.1)
 Copyright (c) 2013 Dave Gandy
 
 This product includes Rickshaw 1.1.2 (http://code.shutterstock.com/rickshaw/ - MIT License)
@@ -44,4 +44,4 @@ Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]
 
 This product includes Moment.js (https://github.com/moment/moment/ - MIT license)
 
-This product includes iframeAutoHeight.js (http://github.com/house9/jquery-iframe-auto-height - MIT license)
\ No newline at end of file
+This product includes iframeAutoHeight.js (http://github.com/house9/jquery-iframe-auto-height - MIT license)