ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [02/50] [abbrv] incubator-ignite git commit: # ignite-450: update LICENSE.txt and NOTICE.txt
Date Fri, 13 Mar 2015 01:48:05 GMT
# ignite-450: update LICENSE.txt and NOTICE.txt


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1d36396b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1d36396b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1d36396b

Branch: refs/heads/ignite-sql-tests
Commit: 1d36396bd9a6ddbddef23293ca4f64bd81c612dc
Parents: f89c3da
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Wed Mar 11 22:32:41 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Wed Mar 11 22:32:41 2015 +0300

----------------------------------------------------------------------
 LICENSE.txt | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 NOTICE.txt  | 10 ++++++++++
 2 files changed, 61 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d36396b/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 90666d8..fb1ada6 100755
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -203,8 +203,17 @@
 
 
 
-For the use of pcollections library (https://github.com/blackdrag/pcollections)
-licensed under the MIT license
+==============================================================================
+Apache Ignite (incubating) Subcomponents:
+
+The Apache Ignite project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+
+==============================================================================
+For the pcollections library (https://github.com/blackdrag/pcollections)
 ==============================================================================
 The MIT License (MIT)
 
@@ -226,4 +235,43 @@ 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.
\ No newline at end of file
+THE SOFTWARE.
+
+
+==============================================================================
+For SnapTree:
+==============================================================================
+SNAPTREE LICENSE
+
+Copyright (c) 2009 Stanford University, unless otherwise specified.
+All rights reserved.
+
+This software was developed by the Pervasive Parallelism Laboratory of
+Stanford University, California, USA.
+
+Permission to use, copy, modify, and distribute this software in source
+or binary form for any purpose with or without fee is hereby granted,
+provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. 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.
+
+   3. Neither the name of Stanford University 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 REGENTS 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 REGENTS 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.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d36396b/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index e4b9fed..1b3fef6 100755
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -19,3 +19,13 @@ http://search.maven.org/#artifactdetails%7Corg.jetbrains%7Cannotations%7C13.0%7C
 This software has a dependency on Persistent Collections library,
 licensed under MIT license.
 https://github.com/blackdrag/pcollections
+
+
+This software has a dependency on Open JDK library,
+licensed under GPL license.
+http://openjdk.java.net/
+
+
+This software has a dependency on snaptree library,
+licensed under SNAPTREE license.
+https://github.com/nbronson/snaptree/


Mime
View raw message