ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sneet...@apache.org
Subject incubator-argus git commit: ARGUS-156: Updated license information for VisualSearch software
Date Sun, 09 Nov 2014 23:03:13 GMT
Repository: incubator-argus
Updated Branches:
  refs/heads/master d0b0ffc73 -> 3125d80dd


ARGUS-156: Updated license information for VisualSearch software


Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/3125d80d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/3125d80d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/3125d80d

Branch: refs/heads/master
Commit: 3125d80dd7d74a6f31919923d7c417d654418b21
Parents: d0b0ffc
Author: sneethiraj <sneethir@apache.org>
Authored: Sun Nov 9 17:31:25 2014 -0500
Committer: sneethiraj <sneethir@apache.org>
Committed: Sun Nov 9 17:31:25 2014 -0500

----------------------------------------------------------------------
 LICENSE.txt | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/3125d80d/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 3ddb4b3..2d7ad44 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -234,7 +234,6 @@ This product includes jQuery Toggles v2.0.4 (http://simontabor.com/labs/toggles
 This product includes jQuery UI Tag-it! (http://aehlke.github.com/tag-it/ - MIT license),
Copyright 2011, Levy Carneiro Jr.
 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 VisualSearch.js 0.4.0 (http://documentcloud.github.com/visualsearch
- MIT license), © 2011 Samuel Clay, @samuelclay, DocumentCloud Inc.  
 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 Handlebars.js (http://handlebarsjs.com/ - MIT license), Copyright ©
2011-2014 by Yehuda Katz.  
@@ -473,6 +472,30 @@ other provisions required by the [___] License. If you do not delete
 the provisions above, a recipient may use your version of this file
 under either the MPL or the [___] License."
 NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the
Source Code files of the Original Code. You should use the text of this Exhibit A rather than
the text found in the Original Code Source Code for Your Modifications.
+-----------------------------------------------------------------------
+ VisualSearch License 
+-----------------------------------------------------------------------
+This product includes VisualSearch.js 0.4.0 (http://documentcloud.github.com/visualsearch),
© 2011 Samuel Clay, @samuelclay, DocumentCloud Inc.  
+
+Copyright (c) 2011 Samuel Clay, @samuelclay, DocumentCloud
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
 
 -----------------------------------------------------------------------
  The Apache License 2.0


Mime
View raw message