accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/6] accumulo git commit: ACCUMULO-4018 Fix binary-tarball LICENSE
Date Sat, 03 Oct 2015 22:10:10 GMT
ACCUMULO-4018 Fix binary-tarball LICENSE

Remove the duplicated bloomfilter and jquery sections.


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

Branch: refs/heads/1.7
Commit: 25f74cd7bbefabff6fa35f6caffbdb37926bb600
Parents: 30c6cb2
Author: Josh Elser <elserj@apache.org>
Authored: Sat Oct 3 18:08:40 2015 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Sat Oct 3 18:09:52 2015 -0400

----------------------------------------------------------------------
 assemble/bin-LICENSE | 76 -----------------------------------------------
 1 file changed, 76 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/25f74cd7/assemble/bin-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE
index da83b27..2f5fd9f 100644
--- a/assemble/bin-LICENSE
+++ b/assemble/bin-LICENSE
@@ -882,79 +882,3 @@ available under the CDDL 1.0 license (http://servlet-spec.java.net).
      California.
 
 ------
-
-This product bundles software from the European Commission project OneLab
-(http://www.one-lab.org),
-
-* BloomFilter.java
-* DynamicBloomFilter.java
-* Filter.java
-
-Copyright (c) 2005, European Commission project OneLab under contract 034819
-
-available under the following BSD 3-Clause style license:
-
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *  - Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the distribution.
- *  - Neither the name of the University Catholique de Louvain - UCL
- *    nor the names of its contributors may be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
-
-----
-
-This product bundles JQuery
-
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
-
-Distributed under the MIT License:
-
-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.
-
-
-----


Mime
View raw message