Repository: incubator-ranger Updated Branches: refs/heads/ranger-0.5 1b833fd1f -> 70eee6770
RANGER-964: Fix NOTICE and LICENSE file contents Signed-off-by: Velmurugan Periasamy <[email protected]> (cherry picked from commit 8aa98a37587b76188e49693433a1131e21594b89) Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/70eee677 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/70eee677 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/70eee677 Branch: refs/heads/ranger-0.5 Commit: 70eee6770c60957d6e0185eaa2dc3ca7dc21f38b Parents: 1b833fd Author: Gautam Borad <[email protected]> Authored: Tue May 17 19:57:06 2016 +0530 Committer: Velmurugan Periasamy <[email protected]> Committed: Tue May 17 10:43:36 2016 -0400 ---------------------------------------------------------------------- LICENSE.txt | 21 ++++++++++++++++++--- NOTICE.txt | 6 ------ 2 files changed, 18 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/70eee677/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index 7d2eff7..0c6c3a2 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -235,9 +235,13 @@ This product includes jQuery UI Tag-it! (http://aehlke.github.com/tag-it/ - MIT This product includes bootbox.js v3.3.0 (http://bootboxjs.com/ - MIT license), Copyright © 2011-2014 by Nick Payne. This product includes moment.js (http://moment.js - MIT license), Copyright © 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors. This product includes Globalize (http://github.com/jquery/globalize - MIT license), Copyright Software Freedom Conservancy, Inc. -This product includes RequireJS 2.1.8 (http://github.com/jrburke/requirejs - New BSD or MIT licensed), Copyright © 2010-2012, The Dojo Foundation All Rights Reserved. +This product includes RequireJS 2.1.8 (http://github.com/jrburke/requirejs - New BSD or MIT licensed), Copyright © 2010-2012, The Dojo Foundation All Rights Reserved. This product includes Handlebars.js (http://handlebarsjs.com/ - MIT license), Copyright © 2011-2014 by Yehuda Katz. - +This product includes Font Awesome 3.2.1 (http://fontawesome.io/ - MIT licence) by Dave Gandy +This product includes Qunit(https://qunitjs.com/ - MIT license) Copyright (c) 2011 John Resig, Jörn Zaefferer +This product includes jQuery Migrate-v1.1.1 (https://plugins.jquery.com/migrate/ - MIT license) Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors +This product includes bootstrap v2.3.2 (http://getbootstrap.com/ - MIT License) Copyright 2013 Twitter, Inc. +This product includes Block UI v1.1.1 (https://github.com/dreamerslab/jquery.msg/ - MIT License) Copyright 2011, Ben Lin. All rights reserved. @@ -314,4 +318,15 @@ This product includes Bootstrap Datepicker (http://www.eyecon.ro/bootstrap-datep This product includes bootstrap-transition.js v2.3.2 (http://twbs.github.com/bootstrap/javascript.html#transitions - Apache License - 2.0), Copyright 2013 Twitter, Inc. This product includes Select2 3.4.3 (http://ivaynberg.github.io/select2/ - Apache License - 2.0), Copyright 2012 Igor Vaynberg. This product includes bootstrap-notify v1.0 (http://goodybag.github.io/bootstrap-notify/ - Apache License - 2.0), Copyright 2012 Goodybag, Inc. -. +This product includes Open Sans font (http://www.opensans.com/ - Apache License - 2.0), © 2016 OpenSans.com + +----------------------------------------------------------------------- + BSD license +----------------------------------------------------------------------- +This product includes jsDump v1.0.0(http://flesler.blogspot.com -BSD licence) Copyright (c) 2008 Ariel Flesler. + + +----------------------------------------------------------------------- + MPL license +----------------------------------------------------------------------- +This product includes jQuery Pines Notify (pnotify) Plugin 1.2.0 (http://sciactive.com/pnotify/- MPL), Copyright © 2009-2012 Hunter Perrin. http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/70eee677/NOTICE.txt ---------------------------------------------------------------------- diff --git a/NOTICE.txt b/NOTICE.txt index 3130ce2..b5841f2 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -5,9 +5,3 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -This product includes Bootstrap Datepicker (http://www.eyecon.ro/bootstrap-datepicker - Apache License - 2.0), Copyright 2012 Stefan Petre. -This product includes bootstrap-transition.js v2.3.2 (http://twbs.github.com/bootstrap/javascript.html#transitions - Apache License - 2.0), Copyright 2013 Twitter, Inc. -This product includes Select2 3.4.3 (http://ivaynberg.github.io/select2/ - Apache License - 2.0), Copyright 2012 Igor Vaynberg. -This product includes jQuery Pines Notify (pnotify) Plugin 1.2.0 (http://sciactive.com/pnotify/- MPL), Copyright © 2009-2012 Hunter Perrin. -This product includes VisualSearch.js 0.4.0 (http://documentcloud.github.com/visualsearch), © 2011 Samuel Clay, @samuelclay, DocumentCloud Inc. -This product includes Require.js Handlebars Plugin (https://github.com/SlexAxton/require-handlebars-plugin - WTFPL + requirejs + handlebars), Copyright © 2011-2014 by Yehuda Katz.
