You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@asterixdb.apache.org by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org> on 2017/12/17 02:18:01 UTC

Change in asterixdb[master]: [NO ISSUE] Update source license for 'asterix-experiments' r...

Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/2233

Change subject: [NO ISSUE] Update source license for 'asterix-experiments' removal
......................................................................

[NO ISSUE] Update source license for 'asterix-experiments' removal

Change-Id: I9a38a59179cd22bd0fd3de964cc2ab99ddc9d92a
---
M asterixdb/LICENSE
M asterixdb/src/main/licenses/templates/source_only_licenses.ftl
2 files changed, 0 insertions(+), 92 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/33/2233/1

diff --git a/asterixdb/LICENSE b/asterixdb/LICENSE
index 7936803..18245c5 100644
--- a/asterixdb/LICENSE
+++ b/asterixdb/LICENSE
@@ -851,51 +851,3 @@
    such warranty or additional liability.
    END OF TERMS AND CONDITIONS
 ---
-   Portions of the AsterixDB Experimental Tests
-       located at:
-         asterix-experiments/src/main/resources/gantt/gantt.py
-
-   are available under a Modified BSD License:
----
-   Copyright (c) 2013, Los Alamos National Security, LLC
-   All rights reserved.
-
-   Copyright 2013. Los Alamos National Security, LLC. This software
-   was produced under U.S. Government contract DE-AC52-06NA25396 for
-   Los Alamos National Laboratory (LANL), which is operated by Los
-   Alamos National Security, LLC for the U.S. Department of Energy.
-   The U.S. Government has rights to use, reproduce, and distribute
-   this software.  NEITHER THE GOVERNMENT NOR LOS ALAMOS NATIONAL
-   SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES
-   ANY LIABILITY FOR THE USE OF THIS SOFTWARE.  If software is modified
-   to produce derivative works, such modified software should be clearly
-   marked, so as not to confuse it with the version available from LANL.
-
-
-   Additionally, 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 Los Alamos National Security, LLC, Los Alamos
-       National Laboratory, LANL, the U.S. Government, 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 LOS ALAMOS NATIONAL SECURITY, LLC 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 LOS ALAMOS NATIONAL SECURITY, LLC 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.
----
diff --git a/asterixdb/src/main/licenses/templates/source_only_licenses.ftl b/asterixdb/src/main/licenses/templates/source_only_licenses.ftl
index 5ff03be..05adfa4 100644
--- a/asterixdb/src/main/licenses/templates/source_only_licenses.ftl
+++ b/asterixdb/src/main/licenses/templates/source_only_licenses.ftl
@@ -214,47 +214,3 @@
 END OF TERMS AND CONDITIONS
 
 </...@license>
-<@license files="asterix-experiments/src/main/resources/gantt/gantt.py"
-          component="AsterixDB Experimental Tests" licenseName="a Modified BSD License">
-Copyright (c) 2013, Los Alamos National Security, LLC
-All rights reserved.
-
-Copyright 2013. Los Alamos National Security, LLC. This software
-was produced under U.S. Government contract DE-AC52-06NA25396 for
-Los Alamos National Laboratory (LANL), which is operated by Los
-Alamos National Security, LLC for the U.S. Department of Energy.
-The U.S. Government has rights to use, reproduce, and distribute
-this software.  NEITHER THE GOVERNMENT NOR LOS ALAMOS NATIONAL
-SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES
-ANY LIABILITY FOR THE USE OF THIS SOFTWARE.  If software is modified
-to produce derivative works, such modified software should be clearly
-marked, so as not to confuse it with the version available from LANL.
-
-
-Additionally, 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 Los Alamos National Security, LLC, Los Alamos
-    National Laboratory, LANL, the U.S. Government, 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 LOS ALAMOS NATIONAL SECURITY, LLC 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 LOS ALAMOS NATIONAL SECURITY, LLC 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.
-</...@license>

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2233
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a38a59179cd22bd0fd3de964cc2ab99ddc9d92a
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>